#126 core reinstated, all tests pass