sync-up with the latest changes since the fork