Compiler:
- fixes for C++ api code generation
Test:
- protocol program development

Change-Id: I4f4ef359df163f92dca352ee34c176011fabf384