Apply fixes made to EAP for bugs 910704, 910732, 910882