Merge branch 'develop' into 86-add-interoperability-test-cases