Merge pull request #38167 from vishakhdesai/perm-check-fix