Merge pull request #12819 from neheb/secc