Bug fix 2551
Merge branch 'master' into avaneesh