p/fuel: Rebase for MaaS dynamic fabric support