Merge "Added a targetAPi check to the user name requirement"