Merge branch 'feature-cnf' into 'master'

Feature cnf

See merge request !7
3 jobs for cnf-ymwang in 0 seconds (queued for 5 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:00:47

passed jenkins

00:00:46

passed jenkins

00:00:46