V 1.3 - Modifications based on feedback received on LightHoouse

Resolved Tickets - #134, #225, #252, #253
Merge branch 'SG-V-1.3' into state_adaptation