Group similar upgrade task.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge pull request #2440 from crynobone/patch/upgrade

Group similar upgrade task.