Include all changes after upgrading to 4.3 except for the new scripts.