CodeMerge-1

Took the version of Changes_Vishnu (3/3) from Sandler-2014 folder