Merge branch 'ts/unpacklimit-config-fix' into maint-2.42