20313 security hardening
Merge branch '20313-security-hardening'