Merge pull request #14611 from SmithSamuelM/sam_2014.7

Support for updated presence behavior in Raetv0.2.12