Merge "Refactor grouped by methods" into main