Merge "Correct scope of "disabled?" check viz backup/restore decisions" into oc-dev