Merge "[CDS][MARIADB] Use specific configuration"