Feature/handle upgradres updates

Addresses #538 (sorry, forgot to put the issue number in the branch name).