initial support for the upgrade operation
Merge branch 'origin/master'