Fixing optional runit
Merge branch 'feature/optional_runit'