[Upgrade]: Apply news changes of Jaws_Template