Merge branch 'api-commands' into dt-test