Merge 1.33 changes