build: sync dolt with upstream
2 files changed