Merge "Fixed issue with MAX_RUNNING_USERS"