Merge remote-tracking branch 'origin/master' into fix/update-test-configuration