Tweaks while debugging issue
Merge branch 'mysql_client_issue'