Merge "Fix normalize doesn't work on carrier template"