Merge "Fix bug 560373." into R160