Merge pull request #9355 from KarinG/patch-4