Fix Tests
Merge branch 'release/1.10'
Merge tag 'v1.10' into develop

1.10