Merge pull request #11544 from neheb/capp