#8271: merge with 3.3.