Merge pull request #6466 from seamuslee001/permisssion_fixup_4.6