Merged features/mp-sched -r8915:9335 into the trunk. The trunk now