protobuf draft bootstrap
Merge branch 'bootstrap-protobuf' into develop