Merge branch 'clean5b' into 'master'

Remove macros from N meeting cycle and more

See merge request !638
1 job for master
Status Job ID Name Coverage
  External
passed jenkins