Merge branch 'nk-bugfixes3' into 'master'

Another round of bugfixes



See merge request !421
3 jobs for master in 3 minutes and 37 seconds (queued for 7 seconds)
Status Job ID Name Coverage
  Quality
passed #491
code-quality

00:00:35

 
  Tests
passed #492
make-test

00:01:56

50.3%
 
  Install
passed #493
make-install

00:00:59