FWK-27 : First pass on save function