Merge branch 'nk-fixes' into 'master'

Nk fixes



See merge request !418
3 jobs for master in 3 minutes and 3 seconds (queued for 8 seconds)
Status Job ID Name Coverage
  Quality
passed #452
code-quality

00:00:32

 
  Tests
passed #453
make-test

00:01:46

49.7%
 
  Install
passed #454
make-install

00:00:42