Merge branch 'nkupdates' into 'master'

Fixed undef errors

See merge request !52
2 jobs for master in 3 minutes and 28 seconds (queued for 1 second)
Status Name Job ID Coverage
  Build
passed build_job #14287

00:01:29

 
  Test
passed test_job #14288

00:01:59