#4711: merge with 3.2.