Merge branch 'nkupdates' into 'master'

Nkupdates

See merge request !4
1 job for master in 48 seconds (queued for 3 seconds)
latest