fix failing unit tests
Merge branch 'i679' into 1.6.x
Merge remote-tracking branch 'origin/1.6.x' into 1.6.x