Squash upstream updates