Merge pull request #10546 from SmithSamuelM/sam_raet_4

Sam raet 4