Merge pull request #12778 from neheb/ap51