Fix whitespace
Merge branch 'feature/composableconfiguration' into develop