Merge branch 'sp/maint-fd-limit' into maint