Merge branch 'jk/interop-test'