Server-side: liquibase and small fix
Merge branch 'dev' into dev-test