Merge pull request #12344 from SmithSamuelM/sam_raet_38

Minor cleanup