Reverted defaults to project standard
Merge branch 'bug/config-defaults' into develop