Upgrade to 2.4.0-M2