fix global var declaration error
Merge branch 'prod' into v2.1.2