Merge pull request #18671 from rgarnov:rg/rmat_and_s11n_fixes
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 28 Oct 2020 10:38:55 +0000 (10:38 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 28 Oct 2020 10:38:56 +0000 (10:38 +0000)

Trivial merge