modify1
Merge branch 'mysql56/modify-endpoint-main-1' into mysql56/modify-endpoint-main-2