Merge branch 'pr-1949' into 3.5-dev