Updated for 2.4.2 release