admin flag changes -cherry picked-