Syncing my fork with our latest changes.