Merge branch 'nkupdates' into 'master'

Fix CXX flags

See merge request !1
2 jobs for master in 4 minutes and 41 seconds (queued for 7 seconds)
Status Name Job ID Coverage
  Build
passed build_job #3404

00:04:17

 
  Test
passed test_job #3405

00:00:23