Merge pull request #18671 from saturnism/patch-1

Updated REX-Ray plugin platform support.