Closes #6631
Merge pull request #6662 from amitmurthy/amitm/exit

Closes #6631