Merge branch 'issue813' into 1.7.x
fix failing unit tests
Merge branch 'issue813' into 2.0.x