changes for 1.34 that were never updated to git