Swap cmb for cmb2
Merge branch 'feature/cmb2-migration' into develop

* feature/cmb2-migration:
  Swap cmb for cmb2