Merge branch '5813-improve-mysql-database-plugin-code-for-mariadb-10-4-compatibility' into 'develop' Resolve "Improve mysql database plugin code for MariaDB 10.4 compatibility" Closes #5813 See merge request !1254