ref: refs/heads/9365-fix-uc-addon-db-recreate
