Merge branch 'git_env' into cisco_changes