Added all changes made to work with 24.3