Merge "Removed deprecated SaveInfo methods." into oc-dev