Sync with official apache thrift 89dc20f