Replaces !1852 (closed) to merge directly in master
See slapos.core!584 (merged)
This will create a new commit in order to revert the existing changes.
