scheduler: merge from 9300u8