Merge "Update to 1.6.34"