Merge branch 'hotfix/mysql' into master-3