Merge "Inclusive jargon"