Merge "Add restriction to remove main user"