Merge "SF: Remove ConnectionHandle concept in Scheduler" into main