Merge branch 'submodulebase' into cpp/all
Added submodule test data for cpp
Merge branch 'master' into cpp/all