diff --git a/dom0/qmemman/qmemman.py b/dom0/qmemman/qmemman.py
index 227cc812..cf6325a7 100755
--- a/dom0/qmemman/qmemman.py
+++ b/dom0/qmemman/qmemman.py
@@ -132,6 +132,9 @@ class SystemState:
         total_memory_transfer = 0
         MIN_TOTAL_MEMORY_TRANSFER = 150*1024*1024
         MIN_MEM_CHANGE_WHEN_UNDER_PREF = 15*1024*1024
+        # If xenfree to low, return immediately
+        if self.XEN_FREE_MEM_LEFT - xenfree > MIN_MEM_CHANGE_WHEN_UNDER_PREF:
+            return True
         for rq in memset_reqs:
             dom, mem = rq
             last_target = self.domdict[dom].last_target
diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py
index 1a3db454..735f2a20 100755
--- a/dom0/qvm-core/qubes.py
+++ b/dom0/qvm-core/qubes.py
@@ -1608,7 +1608,7 @@ class QubesTemplateVm(QubesVm):
         if dry_run:
             return
 
-        super(QubesTemplateVM, self).clone_disk_files(src_vm=src_vm, verbose=verbose)
+        super(QubesTemplateVm, self).clone_disk_files(src_vm=src_vm, verbose=verbose)
 
         if os.path.exists(src_vm.dir_path + '/vm-' + qubes_whitelisted_appmenus):
             if verbose:
@@ -2817,6 +2817,7 @@ class QubesVmCollection(dict):
                 "uses_default_netvm", "label", "memory", "vcpus", "pcidevs",
                 "maxmem", "kernel", "uses_default_kernel", "kernelopts", "uses_default_kernelopts",
                 "mac", "services", "include_in_backups", "debug", "default_user", "qrexec_installed", "drive" )
+                "mac", "services", "include_in_backups", "debug", "default_user" )
 
         for attribute in common_attr_list:
             kwargs[attribute] = element.get(attribute)
diff --git a/dom0/qvm-tools/qvm-prefs b/dom0/qvm-tools/qvm-prefs
index 1f5d6e23..53ccf041 100755
--- a/dom0/qvm-tools/qvm-prefs
+++ b/dom0/qvm-tools/qvm-prefs
@@ -296,6 +296,27 @@ def set_drive(vms, vm, args):
         vm.drive = args[0]
     return True
 
+def set_debug(vms, vm, args):
+    if len (args) != 1:
+        print >> sys.stderr, "Missing value (True/False or on/off)!"
+        return False
+
+    if args[0].lower() == "on":
+        vm.debug = True
+    elif args[0].lower() == "off":
+        vm.debug = False
+    else:
+        vm.debug = bool(eval(args[0].capitalize()))
+    return True
+
+def set_default_user(vms, vm, args):
+    if len (args) != 1:
+        print >> sys.stderr, "Missing user name!"
+        return False
+
+    vm.default_user = args[0]
+    return True
+
 def set_include_in_backups(vms, vm, args):
     if len (args) != 1:
         print >> sys.stderr, "Missing value (True/False)!"
diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index df49f4e7..3cb6a6b2 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -476,14 +476,14 @@ chkconfig messagebus on
 chkconfig iptables on
 chkconfig --add qubes_core || echo "WARNING: Cannot add service qubes_core!"
 chkconfig qubes_core on || echo "WARNING: Cannot enable service qubes_core!"
-chkconfig --add qubes_core_netvm || echo "WARNING: Cannot add service qubes_core!"
-chkconfig qubes_core_netvm on || echo "WARNING: Cannot enable service qubes_core!"
-chkconfig --add qubes_core_appvm || echo "WARNING: Cannot add service qubes_core!"
-chkconfig qubes_core_appvm on || echo "WARNING: Cannot enable service qubes_core!"
-chkconfig --add qubes_firewall || echo "WARNING: Cannot add service qubes_core!"
-chkconfig qubes_firewall on || echo "WARNING: Cannot enable service qubes_core!"
-chkconfig --add qubes-netwatcher || echo "WARNING: Cannot add service qubes_core!"
-chkconfig qubes-netwatcher on || echo "WARNING: Cannot enable service qubes_core!"
+chkconfig --add qubes_core_netvm || echo "WARNING: Cannot add service qubes_core_netvm!"
+chkconfig qubes_core_netvm on || echo "WARNING: Cannot enable service qubes_core_netvm!"
+chkconfig --add qubes_core_appvm || echo "WARNING: Cannot add service qubes_core_appvm!"
+chkconfig qubes_core_appvm on || echo "WARNING: Cannot enable service qubes_core_appvm!"
+chkconfig --add qubes-firewall || echo "WARNING: Cannot add service qubes-firewall!"
+chkconfig qubes-firewall on || echo "WARNING: Cannot enable service qubes-firewall!"
+chkconfig --add qubes-netwatcher || echo "WARNING: Cannot add service qubes-netwatcher!"
+chkconfig qubes-netwatcher on || echo "WARNING: Cannot enable service qubes-netwatcher!"
 chkconfig --add qubes-yum-proxy || echo "WARNING: Cannot add service qubes-yum-proxy!"
 chkconfig qubes-yum-proxy on || echo "WARNING: Cannot enable service qubes-yum-proxy!"
 
@@ -596,7 +596,9 @@ rm -f /etc/systemd/system/getty.target.wants/getty@tty*.service
 /bin/systemctl enable iptables.service 2> /dev/null
 /bin/systemctl enable rsyslog.service 2> /dev/null
 /bin/systemctl enable ntpd.service 2> /dev/null
-/bin/systemctl enable NetworkManager.service
+# Disable original service to enable overriden one
+/bin/systemctl disable NetworkManager.service 2> /dev/null
+/bin/systemctl enable NetworkManager.service 2> /dev/null
 # Enable cups only when it is real SystemD service
 [ -e /lib/systemd/system/cups.service ] && /bin/systemctl enable cups.service 2> /dev/null
 
diff --git a/version_vm b/version_vm
index 0047786a..a2ad95ca 100644
--- a/version_vm
+++ b/version_vm
@@ -1 +1 @@
-2.0.28
+1.7.30