Major DISA improvements (bug #2284)