Merge branch 'hotfix/type_conversion' into develop
add proxy scaffold
completed the proxy logic
Merge branch 'feature/proxy' into develop
Merge branch 'release/proxy'