Merge branch 'develop' into local_var_resolution_issue