Merge branch 'PHP-8.0' into PHP-8.1 * PHP-8.0: Strip MariaDB 10 prefix
Strip MariaDB 10 prefix Closes GH-7972