Merge "Fix text substitution keyname typo"