[BUGFIX] Correct usage of specific and original IDs

Change-Id: I8f0eb05d885c3c0ca84395eab19d691d64c3bfe2
Resolves: #62938
Releases: master
Check for existing UID to avoid update of elements with 0 as container

Change-Id: I156379b16981e7826b5d6e0c477789a3293437d5