v25

Hotfix for DB_CUSTOM_V3 + V5