Merge branch 'stable'
Fix test case error
update for 117
Merge branch 'rel-1.117.0' into stable