Merge "new carrier id version"