Merged affiliation text helpers from dev