Manually merge 2-2-stable PRs together