Merge branch 'separate-os-api-testing'