#9200: merge with 3.2.