High Memory usage after update to 2.4.0-RELEASE