Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks