Merge pull request #6562 from Anjali-Chauhan1/feature/workload-aware-scheduling