#18034: merge with 3.4.