Merge "Refactor logic out of CarrierText"