Updated with shutdown text
Merging from upstream