Apply the next 22 commits (30 more to catch up with upstream)