Merge branch 'refactor/db-not-null-constraints-for-config' into 'develop'