Issue 3266 make new war infrastructure