Merge branch 'further_cmsfv2_tweaks' into 'ibm-trunk'

Further cmsfv2 tweaks

See merge request !37