Merge pull request #7512 from neheb/crt