merging faq changes into staging for preview