Merge branch 'NN_fiximportantthings' into 'master'

fix typos

See merge request !1000
2 jobs for master in 21 seconds (queued for 6 seconds)