Merge branch 'tests-clear-config-tweaks' into 'develop'