Final updates for 2.4.7