Merge branch 'develop'
Merge branch 'develop'
Try to re-connect only when expired. bugid:109331
Oops... I forgot to change version number...
Merge branch 'release-5.2.3' into develop