Add support for message-level originators.
Make originator regular expression case-insensitive.
Merge support for message-level originator.