Merge 3.5: Issue #21668