Handle variable scope for default values correctly

[BanglanfengPan]

This PR is cherry-picked from tmrts#84 to fix tmrts#79

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[agonzale34]

LGTM!

[agonzale34]

@BanglanfengPan after this get merge, we have a github action that will build all the binaries, when you create a new release, we should be able to create a new tag, most likely 0.3.2 and create a release so we get all the binaries built