Merge pull request #12999 from SmithSamuelM/sam_raet_40

Updated for RAET v0.0.14