Merge branch 'cmsfv2_setting_check' into 'ibm-trunk'

Cmsfv2 setting check

See merge request !32