Cherry-pick: Merge cherry-pick 0978566a

Diego Moltenirequested to merge
slb/dm3/ls-fix-m16 into release/0.19

Original merge !634 (merged)

Edited by Chad Leong

Merge request reports