Merge branch 'meeting/LI#56e' into 'master'

Meeting/li#56e

See merge request !24
1 job for draftcr/genericobj
in 0 seconds, using 0 compute credits, and was queued for 0 seconds