Squash 2 commits from upstream