diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index c24ac11dccb..2afca0baa76 100755
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -113,6 +113,73 @@ public class Upgrade410to420 implements DbUpgrade {
         encryptSite2SitePSK(conn);
         migrateDatafromIsoIdInVolumesTable(conn);
         setRAWformatForRBDVolumes(conn);
+        migrateVolumeOnSecondaryStorage(conn);
+        createFullCloneFlag(conn);
+    }
+
+    private void createFullCloneFlag(Connection conn) {
+        ResultSet rs = null;
+        PreparedStatement delete = null;
+        PreparedStatement query = null;
+        PreparedStatement update = null;
+        int numRows = 0;
+        try {
+            delete = conn.prepareStatement("delete from `cloud`.`configuration` where name='vmware.create.full.clone';");
+            delete.executeUpdate();
+            query = conn.prepareStatement("select count(*) from `cloud`.`data_center`");
+            rs = query.executeQuery();
+            if (rs.next()) {
+                numRows = rs.getInt(1);
+            }
+            if (numRows > 0) {
+                update = conn.prepareStatement("insert into `cloud`.`configuration` (`category`, `instance`, `component`, `name`, `value`, `description`) VALUES ('Advanced', 'DEFAULT', 'UserVmManager', 'vmware.create.full.clone' , 'false', 'If set to true, creates VMs as full clones on ESX hypervisor');");
+            } else {
+                update = conn.prepareStatement("insert into `cloud`.`configuration` (`category`, `instance`, `component`, `name`, `value`, `description`) VALUES ('Advanced', 'DEFAULT', 'UserVmManager', 'vmware.create.full.clone' , 'true', 'If set to true, creates VMs as full clones on ESX hypervisor');");
+            }
+            update.executeUpdate();
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Failed to set global flag vmware.create.full.clone: ", e);
+        } finally {
+            if (update != null) {
+                try {
+                    update.close();
+                } catch (SQLException e) {
+
+                }
+            }
+            if (query != null) {
+                try {
+                    query.close();
+                } catch (SQLException e) {
+
+                }
+            }
+            if (delete != null) {
+                try {
+                    delete.close();
+                } catch (SQLException e) {
+
+                }
+            }
+        }
+    }
+
+    private void migrateVolumeOnSecondaryStorage(Connection conn) {
+        PreparedStatement sql = null;
+        try {
+            sql = conn.prepareStatement("update `cloud`.`volumes` set state='Uploaded' where state='UploadOp'");
+            sql.executeUpdate();
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Failed to upgrade volume state: ", e);
+        } finally {
+            if (sql != null) {
+                try {
+                    sql.close();
+                } catch (SQLException e) {
+
+                }
+            }
+        }
     }
 
     private void persistVswitchConfiguration(Connection conn) {
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index b45983209fb..097adc8852a 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -397,10 +397,6 @@ CREATE TABLE `cloud`.`user_vm_clone_setting` (
   PRIMARY KEY (`vm_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-INSERT INTO `cloud`.`configuration` (category, instance, component, name, value, description)
-    SELECT tmp.category, tmp.instance, tmp.component, tmp.name, tmp.value, tmp.description FROM
-    (SELECT 'Advanced' category, 'DEFAULT' instance, 'UserVmManager' component, 'vmware.create.full.clone' name, 'true' value, 'If set to true, creates VMs as full clones on ESX hypervisor' description) tmp
-    WHERE NOT EXISTS (SELECT 1 FROM `cloud`.`configuration` WHERE name = 'vmware.create.full.clone');
 
 CREATE TABLE `cloud`.`affinity_group` (
   `id` bigint unsigned NOT NULL auto_increment,