Fix for the errors during the CI build.
Translatable state names.
Fix for the error in the CI build.
Merge branch 'develop'