Resolved merge conflitcs after reverting ff9ddace6abf48304a2dd4b7497b189a95bbc246 which causes tests to stall.