[1.7.x] Fixed #23016 -- Updated FAQs per Aymeric's suggestions.

Backport of 549284faa4 from master