[Dev] Simplified the configuration supporting Protobuf.
Merge branch 'trunk' into releases