Merge branch 'pr-1358' into 3.4-dev