Merge branch 'ps/attr-limits' into maint-2.30