Part II - Pre-upgrade tasks