Changes already committed in the eggrack repo