Pushed to upstream

cc/ @ealonso