Merge patch branch changes to main.