Merge branch 'feature/no-empty-string-fallback-for-nullable' into develop
Merge branch 'feature/non-nullable-translation-fields' into develop