Technical merge of released branch 2.34-BRANCH into 3.x