corrected typo in config production
Merge branch 'dev' into features
Merge branch 'features'