Merge pull request #20547 from seamuslee001/admin_guards