This fixed badly merged nexedi/slapos!394, that contained rebased commits
mentioned in merge request !394 (merged)