port fb changes

port fb changes

rebase on top of lastest changes