Merge branch 'cr/TS103221-1/027' into 'meeting/LI58e'

TS 103 221-1 CR027 - Generic Objects

See merge request !43
1 job for meeting/LI58e in 27 seconds