Merge 3.5: issue #26801