Update from upstream to 2.4.0 version