Merge branch 'pr-1758' into 3.5-dev