DEVIDM-82: Configuration changes.