Initial work on migration to sebastian/comparator
Merge branch 'master' into comparator
Fixed failing tests.
Merge branch 'master' into comparator
Cleanup
Merge branch '4.0'
Merge branch 'master' into comparator