Merge pull request #10030 from neheb/p1123