Fix some failing unit tests.
Merge branch '2.4-dev' into 2.5-testing
Merge branch '2.5-testing' into 2.6-dev