Changes for 3.5.4.1570