Merge tag '1.6.8' into develop

Release 1.6.8
Fix for upgrade dsp path
rp
Merge branch 'release/1.6.9'