Original commit reverted in 976de7130b338aa0d0e63255826a79347635c107 due to test failures. This commit includes fixes for the tests.
Original commit reverted in 976de7130b338aa0d0e63255826a79347635c107 due to test failures. This commit includes fixes for the tests.