Merge "MessageFormatterFactory"