Merge branch 'dev' of gitlab.com:redmic-project/server/vessel/postgresql into dev