Merge branch 'maint-2.7' into maint-2.8