#13510: merge with 3.3.