Merge "Minor content/messaging changes in advance of final review."