Merge 1.34 changes and other fixes