BACKLOG-3585 : Make the 5 modules from templates-set independent