fix failing test
Merge remote-tracking branch 'origin/1.7.x' into 1.7.x