Fix Bug number 2393
bug fix 2398
code review for ritesh changes
Merge branch 'ritesh'