Replaced deep data copy

Change-Id: I75949d1eabe6ee5513a1203acfa4a35656ceda09