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