#15923: merge with 3.3.