Merge branch 'refactor/db-add-defaults' into 'develop'