Merge branch 'master' into raw-test-api