Bug Fix rel 1.1  made for release 1
Resolve Merge conflict in r2_test1 & Master
Finished cding on r2_test1 branch by Team1