Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements