Merge branch 'pr-2115' into 3.6-dev