Merge branch 'i544' into 1.6.x
add more tests
fix merge conflicts
fix failing test