non-thrift changes
12 files changed