Upgrade support and code merge

Functional:
https://albino.pistoncloud.com/job/pentOS/10374/

Upgrade:
https://albino.pistoncloud.com/job/pentOS/10344/