[SD-1186] Unique ID is removed
Merge remote-tracking branch 'upstream/devel' into devel