DDBEXTRA-194: adaptations