Conflicts: CMakeLists.txt src/settings/SettingsManager.cpp src/settings/SettingsManager.h Former-commit-id: 2811fee52e
2811fee52e