release-1.7
Indention fixed
Make src folder files evergreen
Merge pull request #12175 from petetnt/petetnt/ctrl-z-hotfix