mfc5x: merge from 9300u8