Release 2.4 (take 2)