Bug fix 2445
Merge branch 'avaneesh'