anydb - merge upstream changes