Merge "Update comment on why Keep is needed." into oc-dev