Sync'd with 0.8.32