Merge "Use Context on ProtectionForm for messages"