Backporting facebook fix
Back-porting blog fixes