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)