Merge branch 'maint-2.36' into maint-2.37