updating code to handle appended and prepended text fields, not just one or the other
Merge remote-tracking branch 'remotes/upstream/appended_and_prepended_text'