Merge branch 'upstream' into fix_git_clean_test
Merge branch 'fix_git_clean_test' into shlima_redesign