Prepare for new development iteration.
Merge remote-tracking branch 'origin/1.7.x' into 1.7.x
add more unit tests and fix failing tests
fix failing unit test
Merge branch 'issue892' into 1.7.x