#14146: merge with 3.3.