#14254: merge with 3.3.