Merge branch 'security-1.6' into HEAD