Merge "Added isUserNameSet" into oc-dev