Improving CMakeLists
Merge branch 'feature/37592813-CMakeLists' into develop