Merge "Bugfix for Bug 497543"