integrate the thrift changes