Merge "Don't verify secondary setting on restore" into oc-dev