Merge "Sometimes there's no advanced settings" into oc-mr1-dev