Merge pull request #18339 from rgarnov:rg/rmat_integration