Enable EIP whenever possible
Merge remote-tracking branch 'chiiph/bug/enable_eip_whenever_possible' into develop