Merge "If two groups are posted to settings, remove old group and log." into oc-dev