batch 1
batch 2
batch 3
Merge pull request #189 from telefonicaid/hardening/more_cpp_xmls_to_separate_file_02

Hardening/more cpp xmls to separate file 02