Merge branch 'fix/config-test-warning' into 'develop'