Merge "Correct check of is user running" into lmp-mr1-dev