Merge branch 'Omar' into 'master'

Omar changes

See merge request !24
4 jobs for master in 25 seconds (queued for 2 seconds)
latest