Merged with master and added missing user related code.