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