Merge remote-tracking branch 'colorant/yarn-client-scheduler'