Fix cmake merge

Merged Nicolas Michon requested to merge fix_merge into bc

Merge request reports