Dileep | including template files in mangrove egg
Merge branch '8_0_release' into develop