Merge branch 'pr-1325' into 3.4-dev