Merge "ctl upgrade confirmation fixes"