Upgrade Boon 0.13, revert back workaround, close #1687
Clean up