Merge branch 'maint-2.35' into maint-2.36