Merge bug/db-migrations

Michael Ritter requested to merge bug/db-migrations into develop

Fix old migrations which were incomplete.

Merge request reports