Merge "Also configure if enabled and connected but not configured." into oc-dev