Merge "Make API createAndManageUser public"