THRIFT-2641 Port FB Changes