Found and fixed code generation problem with some templates that were
duplicated