Merging PR #9043

Merging PR #9043