MR EP4 Obiwan upgrade and fix

MR EP4 Obiwan and fix