#5492: merge with 3.3