Merge pull request #19217 from totten/master-assert-perm