Merge branch '1.7.x' into issue536
remove sysout
Merge branch 'issue536' into 1.7.x
Merge branch '1.7.x' into issue779
fix failing unit test