Merge "sys user split: assign admin/primary flag"