Merge branch 'extension-api' into dt-test