Merge "Changed output of get-main-user." into udc-dev