Merge branch 'pr-2666' into 3.7-dev