second part of slapos.core!695 (merged)
This will create a new commit in order to revert the existing changes.