Merge "SF: Split Scheduler initialization"