12 Commits (fix-csh)