Merge branch 'security-master' into HEAD