Changes and Updates related to supporting 2.9