JBTM-2045 Updated to the latest templates