Merge pull request #16887 from SmithSamuelM/sam_dev1

Added partial support for Multi-Master in Raet