2.4.x packaging updates