Squash commits for 4.3