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