Merge "Use local context to get messages"