#26246: merge with 3.4.