(OSD BRANCH) Sync with main
(OSD BRANCH) Fix memory issues with QT debugger
(OSD BRANCH) Keep order in new ini structure consistent
(OSD BRANCH) cleanup