Merge "Use local context to get messages and don't use implicit Message object to...