3.19fix
Merge branch 'master' into release_mysql