fixup typemaps unittest
Merge remote-tracking branch 'origin/develop' into release-1.9.0