Merge "MagicWordFactory to replace MagicWord static members/methods"