Update to 2.4.0 core