Changes for 5.4