CDB-406 #resolve - Problems with embed view and old template_name done