Server-side: account branch fix
Merge branch 'dev' into dev-test