Conflicts: CMakeLists.txt config/hyperion.config.json Former-commit-id: 43d42e4fed479f60333b35bc092f9a55cd2ad8e8