Merge "Corrected alert window text based on UX feedback." into oc-dev