#16530: merge with 3.3.