Changes for 6.4