Upgrade Boon 0.25, close #2172