Merge branch 'pr-2665' into 3.7-dev