Allow the mixing of rename and default var; fixes #587#589

liuzicheng1987 merged 2 commits intomaingetml/reflect-cpp:mainfrom

f/rename_default_var_fixgetml/reflect-cpp:f/rename_default_var_fixCopy head branch name to clipboard