Merge commit '14431701ea5e5dc01288caa437d5283dc71f0ceb' as 'www/dev/2.2/addons/shared_addons/modules/faq'