DEVIDM-94: Various improvements.