backport r15571 and give it a changelog entry