Merge "Better handling of Message objects as Message parameters"