Fixed security vulnerability
Merge branch 'development' into userpage-refactor