Merge with 3.2 for issue #16262