DEVIDM-94: Config improvements.