Merge "Fix normalize doesn't work on carrier template" into sc-qpr1-dev