Merge "Fix the "User not running: 0" issue"