A few commits for EAP

FYI - these have already been done on 2.4.x and master.