Merge "Correct check of is user running"