Merge branch 'pr-2645' into 3.7-dev