added failing test
fixed failing test
Merge branch 'v1.8'