Merge branch '1229-dpid-0-used-irrespective-of-the-specified-one-for-ism1' into 'main'

[Non-BE] Resolve "dpid 0 used irrespective of the specified one for ism1"

See merge request !1872