Merge tag 'v2.13.5' into maint