#11963: merge with 3.3.