Text Edits
Merged Mark's changes downstream and will push my text edits back up.