BS-2716
Fix generation template