security fix
1.7.2
Merge branch 'fix/securityMaster'