PMO-2800: fixed issues saving DSD