Merge "Change protection level from ephemeral to instant" into oc-mr1-dev