Merge "Fixes Bug 6469 "