Merge r1774286 from trunk: Follow up to r1773761: restore EOC semantic. Submitted by: ylavic Reviewed/backported by: jim