Merge branch 'fix/use-config-when-possible' into 'develop'