#4783: Merge with 3.2.