Merge branch 'feat/23-templates-are-not-dumped-when-flag-is-set-to-true' into 'develop'
Resolve "Templates are not dumped when flag is set to true" See merge request !20
Resolve "Templates are not dumped when flag is set to true" See merge request !20