#8040: merge with 3.3.