Pushed to upstream

cc/ @marcellustavares @pablocp