No need for unittest2
Remove unused import

[ci skip]
Merge remote-tracking branch 'upstream/develop' into develop