Merge "Refactor Carrier text as a movable module." into jb-mr1-dev