Merge "Refactoring TAPL functions for OverviewTask" into main