Update messages (issue 7685 + 7686)
Start download automatically if manual upgrade happens.
Remove TODO comment