am d234dc1f: Merge "Correct check of is user running"

* commit 'd234dc1f20d3a68e0dd9f2c3a5f14282fba79b13':
  Correct check of is user running