Merge branch 'jk/interop-test' into maint