Merge branch '3.2'

Issue #13491.