#670664: merge with 3.2.