[Devel] [PATCH 0/2] Fix DBG2 compilation template issue