Merge branch 'nkwork3' into 'master'

Nkwork3

See merge request !22
3 jobs for master in 1 minute and 24 seconds (queued for 3 seconds)