#2650: Merge with 3.2.