Bug fix for r1 release in Master branch
Edited for r2_test branch by Team1
Resolve Merge conflict in r2_test1 & Master
Finished cding on r2_test1 branch by Team1
Merge branch 'r2_test1'