Make sy-ls and sy-restore more flexible
Merge branch 'develop' into feature/daemon