Added latest 2.4 changes