Fixes unit tests
Fixes unit tests
Merge branch '6.1.2' into 7.0.0