Merge branch 'nkwork1' into 'master'

Nkwork1

See merge request !21
3 jobs for master in 3 minutes and 2 seconds (queued for 2 seconds)