Reapplying commits (synced with upstream)