Merge pull request #12736 from calbasi/master