Sync with latest updates from Edward.