Merge "Lower-level user enumeration; fix disabled bug." into oc-dev