wip/etoile-services/patches
