Merge "Check if username is null" into sc-dev