Merge branch 'issue695' into 1.6.x
Merge remote-tracking branch 'origin/issue695' into 1.6.x
Merge branch 'issue696' into 1.6.x
rename test method
Merge branch 'issue696' into 1.6.x
Merge branch 'issue696' into 2.0.x
fix failing test
Merge branch 'fixTest' into 2.0.x