some security checks
Merge branch 'hotfixes' into develop