Merge pull request #9327 from nupplaphil/task/security_restructure