i058959 - for adjustment of c++ template
i058959 - for template updates of source code skeleton