Fixed security bug
Merge branch 'hotfix/security-patch-1'