Merge branch 'pr-1754' into 3.5-dev