Sync with duckbox-developers