#11897: Merge with 3.2.