5/2 pull

sync with eoe