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