Hello! I went ahead and pushed the patch as 4245ddcbc9f935804c17c97872b90ec1050c2d75.
One modification I had to make and which I hadn’t though of before is the new ‘load-services/safe’ procedure I added: it makes sure it DTRT when talking to shepherd < 0.15.0. I’ve reconfigured from master, and so far so good! :-) I’m closing this issue. I suggest opening new ones for specific improvements we discussed. Thank you! Ludo’.