Get rid of modeline E518 error
Merge branch 'feature/daemon-fixes' into local-develop