SONATA-481 - Updated templates