Merge branch 'clean-byon-ns' into 'proactive-dev'

Clean byon ns

See merge request !134
6 jobs for proactive-dev in 2 minutes and 40 seconds (queued for 10 seconds)