Merge branch 'nkupdates' into 'master'

Updated to v4.2.4

See merge request !3
2 jobs for master in 4 minutes and 44 seconds (queued for 4 seconds)
latest
Status Name Job ID Coverage
  Build
passed build_job #3625

00:04:20

 
  Test
passed test_job #3626

00:00:24