fix unit tests
Merge remote-tracking branch 'origin/target-4.4.0' into target-4.4.0