Bug Fix :2344
Merge branch 'master' into avaneesh

erging master into avaneesh
Merge branch 'master' into avaneesh