Merge branch 'meeting/LI59e' into 'master'

Meeting LI59e

See merge request !78
in 21 seconds, using 0 compute credits, and was queued for 5 seconds