#16019, #16020: merge with 3.2.