Merge pull request #19505 from mattwire/remotememrelated