Changes for 4.6.4