Merge patch branch changes back to main.