announce merge and 2.4 release