Merge branch 'nkupdates' into 'master'

Updated and migrated

See merge request !1
1 job for master in 40 seconds (queued for 2 seconds)
Status Name Job ID Coverage
  Test
passed test_job #796

00:00:40