Merge pull request #10713 from SmithSamuelM/sam_raet_11

Sam raet 11