Issue #5765: Merge from 3.3