Fix set_eip_status wrong call
Merge remote-tracking branch 'chiiph/bug/fix_eip_status_call' into develop