Squash latest changes