Merge "Handle shutdown for right user"