Server-side: security refactoring
Server-side: security refactoring
Merge remote-tracking branch 'origin/dev' into dev
Merge remote-tracking branch 'origin/dev' into dev