check only when starting a drallo
Merge branch 'DA-404' into unstable

* DA-404:
  check only when starting a drallo