Bug Fix 2486 and 2530
Merge branch 'master' into avaneesh