fixed UUID's issue and added association for id
Authored by: philsp 2019-01-08
Parent: [r4834]
Child: [r4836]