Merge branch 'whole-db-removal' into 'develop'