Merge "Refactoring OverviewCommandHelper (2/3)" into main