- Add back optimize hoppers (#8999)