Merge branch 'master' into integration-tests