Latest updates for 2.4.6