Merge changes from patch branch back to main.