Merged the new Saft part
Task [DWOSS-1]