#11282: merge with 3.2.