Merge "Update CoreParserFunctions to use MagicWordFactory"