Initial pass at upgrade support from Cloud 3 to Cloud 4