Final faq 

Did some cherry picking and then some rebase.