[base system & package/block-extroot] Merged 23110-23112 which allows block-extroot...