port fb changes

port fb changes

rebase on top of lastest changes
THRIFT-2641 Port FB Changes