Merge branch 'hotfix/1.1.3'
Merge branch 'release/2.0.0'
capture helper change & fix tests case