Update to EAP idea 135.908