Initial import
Oneof related fixes