Changes for 6.0.1