Merge "fix issues with precise carrier id"