Merging latest unity_dev changes

Merged Vasudevan, Rama K requested to merge unity_dev into master

Created by: CompPhysChris

Merge request reports