depending on https://jira.mariadb.org/browse/CONC-509 (cherry picked from commit f922a7dff644451a05a6b0088b652fbe86dafebc)