Hack to deal with case issue
Merge branch 'feature/cmake-cleanup-projectfiles' into merge-test

* feature/cmake-cleanup-projectfiles:
  Hack to deal with case issue