#11955: merge with 3.4.