Merge request fix DSD-9206

Closed octavio.gzain requested to merge octavio.gzain/dss-mainline:fix_dsd_9206 into R2011 Nov 16, 2020