Backport fix for Bug#11677 from trunk