TODO(ISSUE) comment ADDED in Shell/Shell.cpp .