Merge "Change use of eob in the encoder"