Hotfix/mysqlstrict