Merge branch 'nkupdates' into 'master'

Nkupdates

See merge request !428
3 jobs for master in 2 minutes and 23 seconds (queued for 56 seconds)