Merge "Use local context to get message"