Merge pull request #13719 from wateret/fix-multiregop