Merge "Improve support for legacy messages"