Merge branch 'chore/fixup-testsuite-import' into 'develop'