Merge pull request #10040 from neheb/per