Merge branch 'jk/daemon-path-ok-check-truncation'