Server-side: logger added
Merge remote-tracking branch 'origin/dev-test' into dev