Port 791850bbf... to faq.md