Merge "Use context when parsing message 'redirectedfrom'"