Cnms dev

Merged Vasudevan, Rama K requested to merge cnms_dev into master

Created by: CompPhysChris

see commit log for details

Merge request reports