Backport #11593

Backport of #11593 to stable7. - Just here to give Jenkins a chance of executing the tests for stable7. - Merge after Jenkins passed.