#5723: merge with 3.1.
19 files changed