Merge "Default CMHandles to READY during upgrade"