0026219: ShapeUpgrade_UnifySameDomain fails with StdFail_NotDone exception