136 files changed, 1857 insertions, 943 deletions
diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index 38cf4599c..64ae35786 100644
--- a/src/arm/arm.conf.in
+++ b/src/arm/arm.conf.in
@@ -22,9 +22,9 @@ GLOBAL_PREFIX = @MONKEYPREFIX@
 # system-level services (and we'll expect a second ARM to be
 # run per-user to run user-level services).  Note that in this
 # case you must have manually created a different configuration
-# file with the user where at least this and the USER_ONLY
+# file with the user where at least this and the START_USER_SERVICES
 # options differ.
-# SYSTEM_ONLY = YES
+# START_SYSTEM_SERVICES = YES
 # If set to YES, ARM will only start services that are marked as
 # per-user services (and we'll expect a system user to run ARM to
@@ -39,7 +39,7 @@ GLOBAL_PREFIX = @MONKEYPREFIX@
 # USER ARM instances to some free port (counting down from 2085 should
 # be sane).
 #
-# USER_ONLY = YES
+# START_USER_SERVICES = YES
 # File where we should log per-service resource consumption on exit.
 # RESOURCE_DIAGNOSTICS = resource.log
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 6924ca676..bc138e6fc 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -235,6 +235,11 @@ static struct GNUNET_DISK_PipeHandle *sigpipe;
 static int in_shutdown;
 /**
+ * Return value from main
+ */
+static int global_ret;
+/**
 * Are we starting user services?
 */
 static int start_user = GNUNET_YES;
@@ -346,11 +351,15 @@ get_server_addresses (const char *service_name,
  *addrs = NULL;
  *addr_lens = NULL;
  desc = NULL;
-  if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "DISABLEV6"))
+  if (GNUNET_CONFIGURATION_have_value (cfg,
+                                       service_name,
+                                       "DISABLEV6"))
  {
    if (GNUNET_SYSERR ==
        (disablev6 =
-         GNUNET_CONFIGURATION_get_value_yesno (cfg, service_name, "DISABLEV6")))
+         GNUNET_CONFIGURATION_get_value_yesno (cfg,
+                                               service_name,
+                                               "DISABLEV6")))
      return GNUNET_SYSERR;
  }
  else
@@ -359,18 +368,24 @@ get_server_addresses (const char *service_name,
  if (! disablev6)
  {
    /* probe IPv6 support */
-    desc = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0);
+    desc = GNUNET_NETWORK_socket_create (PF_INET6,
+                                         SOCK_STREAM,
+                                         0);
    if (NULL == desc)
    {
-      if ((ENOBUFS == errno) || (ENOMEM == errno) || (ENFILE == errno) ||
+      if ( (ENOBUFS == errno) ||
-          (EACCES == errno))
+           (ENOMEM == errno) ||
+           (ENFILE == errno) ||
+           (EACCES == errno) )
      {
-        LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket");
+        LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR,
+                      "socket");
        return GNUNET_SYSERR;
      }
      LOG (GNUNET_ERROR_TYPE_INFO,
           _("Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"),
-           service_name, STRERROR (errno));
+           service_name,
+           STRERROR (errno));
      disablev6 = GNUNET_YES;
    }
    else
@@ -381,11 +396,15 @@ get_server_addresses (const char *service_name,
  }
  port = 0;
-  if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "PORT"))
+  if (GNUNET_CONFIGURATION_have_value (cfg,
+                                       service_name,
+                                       "PORT"))
  {
    if (GNUNET_OK !=
-        GNUNET_CONFIGURATION_get_value_number (cfg, service_name,
+        GNUNET_CONFIGURATION_get_value_number (cfg,
-                                               "PORT", &port))
+                                               service_name,
+                                               "PORT",
+                                               &port))
    {
      LOG (GNUNET_ERROR_TYPE_ERROR,
           _("Require valid port number for service `%s' in configuration!\n"),
@@ -400,11 +419,15 @@ get_server_addresses (const char *service_name,
    }
  }
-  if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "BINDTO"))
+  if (GNUNET_CONFIGURATION_have_value (cfg,
+                                       service_name,
+                                       "BINDTO"))
  {
    GNUNET_break (GNUNET_OK ==
-                  GNUNET_CONFIGURATION_get_value_string (cfg, service_name,
+                  GNUNET_CONFIGURATION_get_value_string (cfg,
-                                                         "BINDTO", &hostname));
+                                                         service_name,
+                                                         "BINDTO",
+                                                         &hostname));
  }
  else
    hostname = NULL;
@@ -413,10 +436,14 @@ get_server_addresses (const char *service_name,
  abstract = GNUNET_NO;
 #ifdef AF_UNIX
  if ((GNUNET_YES ==
-       GNUNET_CONFIGURATION_have_value (cfg, service_name, "UNIXPATH")) &&
+       GNUNET_CONFIGURATION_have_value (cfg,
+                                        service_name,
+                                        "UNIXPATH")) &&
      (GNUNET_OK ==
-       GNUNET_CONFIGURATION_get_value_filename (cfg, service_name, "UNIXPATH",
+       GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                              &unixpath)) &&
+                                                service_name,
+                                                "UNIXPATH",
+                                                &unixpath)) &&
      (0 < strlen (unixpath)))
  {
    /* probe UNIX support */
@@ -425,7 +452,8 @@ get_server_addresses (const char *service_name,
    if (strlen (unixpath) >= sizeof (s_un.sun_path))
    {
      LOG (GNUNET_ERROR_TYPE_WARNING,
-           _("UNIXPATH `%s' too long, maximum length is %llu\n"), unixpath,
+           _("UNIXPATH `%s' too long, maximum length is %llu\n"),
+           unixpath,
           (unsigned long long) sizeof (s_un.sun_path));
      unixpath = GNUNET_NETWORK_shorten_unixpath (unixpath);
      LOG (GNUNET_ERROR_TYPE_INFO,
@@ -439,9 +467,9 @@ get_server_addresses (const char *service_name,
    if (GNUNET_SYSERR == abstract)
      abstract = GNUNET_NO;
 #endif
-    if ((GNUNET_YES != abstract)
+    if ( (GNUNET_YES != abstract) &&
-        && (GNUNET_OK !=
+         (GNUNET_OK !=
-            GNUNET_DISK_directory_create_for_file (unixpath)))
+          GNUNET_DISK_directory_create_for_file (unixpath)) ) 
      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
                                "mkdir",
                                unixpath);
@@ -451,8 +479,10 @@ get_server_addresses (const char *service_name,
    desc = GNUNET_NETWORK_socket_create (AF_UNIX, SOCK_STREAM, 0);
    if (NULL == desc)
    {
-      if ((ENOBUFS == errno) || (ENOMEM == errno) || (ENFILE == errno) ||
+      if ( (ENOBUFS == errno) ||
-          (EACCES == errno))
+           (ENOMEM == errno) ||
+           (ENFILE == errno) ||
+           (EACCES == errno) )
      {
        LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket");
        GNUNET_free_non_null (hostname);
@@ -474,19 +504,29 @@ get_server_addresses (const char *service_name,
  }
 #endif
-  if ((0 == port) && (NULL == unixpath))
+  if ( (0 == port) &&
+       (NULL == unixpath) )
  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
+    if (GNUNET_YES ==
-         _("Have neither PORT nor UNIXPATH for service `%s', but one is required\n"),
+        GNUNET_CONFIGURATION_get_value_yesno (cfg,
-         service_name);
+                                              service_name,
+                                              "START_ON_DEMAND"))
+      LOG (GNUNET_ERROR_TYPE_ERROR,
+           _("Have neither PORT nor UNIXPATH for service `%s', but one is required\n"),
+           service_name);
    GNUNET_free_non_null (hostname);
    return GNUNET_SYSERR;
  }
  if (0 == port)
  {
-    saddrs = GNUNET_malloc (2 * sizeof (struct sockaddr *));
+    saddrs = GNUNET_new_array (2,
-    saddrlens = GNUNET_malloc (2 * sizeof (socklen_t));
+                               struct sockaddr *);
-    add_unixpath (saddrs, saddrlens, unixpath, abstract);
+    saddrlens = GNUNET_new_array (2,
+                                  socklen_t);
+    add_unixpath (saddrs,
+                  saddrlens,
+                  unixpath,
+                  abstract);
    GNUNET_free_non_null (unixpath);
    GNUNET_free_non_null (hostname);
    *addrs = saddrs;
@@ -504,7 +544,10 @@ get_server_addresses (const char *service_name,
    if (disablev6)
      hints.ai_family = AF_INET;
    hints.ai_protocol = IPPROTO_TCP;
-    if ((0 != (ret = getaddrinfo (hostname, NULL, &hints, &res))) ||
+    if ((0 != (ret = getaddrinfo (hostname,
+                                  NULL,
+                                  &hints,
+                                  &res))) ||
        (NULL == res))
    {
      LOG (GNUNET_ERROR_TYPE_ERROR,
@@ -538,8 +581,10 @@ get_server_addresses (const char *service_name,
    resi = i;
    if (NULL != unixpath)
      resi++;
-    saddrs = GNUNET_malloc ((resi + 1) * sizeof (struct sockaddr *));
+    saddrs = GNUNET_new_array (resi + 1,
-    saddrlens = GNUNET_malloc ((resi + 1) * sizeof (socklen_t));
+                               struct sockaddr *);
+    saddrlens = GNUNET_new_array (resi + 1,
+                                  socklen_t);
    i = 0;
    if (NULL != unixpath)
    {
@@ -591,8 +636,10 @@ get_server_addresses (const char *service_name,
      if (NULL != unixpath)
        resi++;
      i = 0;
-      saddrs = GNUNET_malloc ((resi + 1) * sizeof (struct sockaddr *));
+      saddrs = GNUNET_new_array (resi + 1,
-      saddrlens = GNUNET_malloc ((resi + 1) * sizeof (socklen_t));
+                                 struct sockaddr *);
+      saddrlens = GNUNET_new_array (resi + 1,
+                                    socklen_t);
      if (NULL != unixpath)
      {
        add_unixpath (saddrs, saddrlens, unixpath, abstract);
@@ -612,12 +659,17 @@ get_server_addresses (const char *service_name,
      resi = 2;
      if (NULL != unixpath)
        resi++;
-      saddrs = GNUNET_malloc ((resi + 1) * sizeof (struct sockaddr *));
+      saddrs = GNUNET_new_array (resi + 1,
-      saddrlens = GNUNET_malloc ((resi + 1) * sizeof (socklen_t));
+                                 struct sockaddr *);
+      saddrlens = GNUNET_new_array (resi + 1,
+                                    socklen_t);
      i = 0;
      if (NULL != unixpath)
      {
-        add_unixpath (saddrs, saddrlens, unixpath, abstract);
+        add_unixpath (saddrs,
+                      saddrlens,
+                      unixpath,
+                      abstract);
        i++;
      }
      saddrlens[i] = sizeof (struct sockaddr_in6);
@@ -663,6 +715,7 @@ signal_result (struct GNUNET_SERVICE_Client *client,
  struct GNUNET_MQ_Envelope *env;
  struct GNUNET_ARM_ResultMessage *msg;
+  (void) name;
  env = GNUNET_MQ_msg (msg,
                       GNUNET_MESSAGE_TYPE_ARM_RESULT);
  msg->result = htonl (result);
@@ -1184,6 +1237,7 @@ check_start (void *cls,
  uint16_t size;
  const char *servicename;
+  (void) cls;
  size = ntohs (amsg->header.size) - sizeof (struct GNUNET_ARM_Message);
  servicename = (const char *) &amsg[1];
  if ( (0 == size) ||
@@ -1254,6 +1308,7 @@ handle_start (void *cls,
 static void
 trigger_shutdown (void *cls)
 {
+  (void) cls;
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Triggering shutdown\n");
  GNUNET_SCHEDULER_shutdown ();
@@ -1275,6 +1330,7 @@ check_stop (void *cls,
  uint16_t size;
  const char *servicename;
+  (void) cls;
  size = ntohs (amsg->header.size) - sizeof (struct GNUNET_ARM_Message);
  servicename = (const char *) &amsg[1];
  if ( (0 == size) ||
@@ -1451,6 +1507,7 @@ handle_test (void *cls,
  struct GNUNET_MQ_Envelope *env;
  struct GNUNET_MessageHeader *msg;
+  (void) message;
  env = GNUNET_MQ_msg (msg,
                       GNUNET_MESSAGE_TYPE_ARM_TEST);
  GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
@@ -1498,7 +1555,7 @@ list_count (struct ServiceList *running_head)
  struct ServiceList *i;
  unsigned int res;
-  for (res = 0, i = running_head; i; i = i->next, res++)
+  for (res = 0, i = running_head; NULL != i; i = i->next, res++)
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                "%s\n",
                i->name);
@@ -1518,6 +1575,7 @@ shutdown_task (void *cls)
  struct ServiceList *nxt;
  struct ServiceListeningInfo *sli;
+  (void) cls;
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "First shutdown phase\n");
  if (NULL != child_restart_task)
@@ -1589,6 +1647,7 @@ delayed_restart_task (void *cls)
  struct GNUNET_TIME_Relative lowestRestartDelay;
  struct ServiceListeningInfo *sli;
+  (void) cls;
  child_restart_task = NULL;
  GNUNET_assert (GNUNET_NO == in_shutdown);
  lowestRestartDelay = GNUNET_TIME_UNIT_FOREVER_REL;
@@ -1656,7 +1715,7 @@ delayed_restart_task (void *cls)
 * Task triggered whenever we receive a SIGCHLD (child
 * process died).
 *
- * @param cls closure, NULL if we need to self-restart
+ * @param cls closure, NULL 
 */
 static void
 maint_child_death (void *cls)
@@ -1672,6 +1731,7 @@ maint_child_death (void *cls)
  unsigned long statusCode;
  const struct GNUNET_DISK_FileHandle *pr;
+  (void) cls;
  pr = GNUNET_DISK_pipe_handle (sigpipe,
                                GNUNET_DISK_PIPE_END_READ);
  child_death_task = NULL;
@@ -1914,6 +1974,7 @@ setup_service (void *cls,
  socklen_t *addr_lens;
  int ret;
+  (void) cls;
  if (0 == strcasecmp (section,
                       "arm"))
    return;
@@ -1929,11 +1990,11 @@ setup_service (void *cls,
  if ((GNUNET_YES ==
       GNUNET_CONFIGURATION_have_value (cfg,
                                        section,
-                                        "USER_SERVICE")) &&
+                                        "RUN_PER_USER")) &&
      (GNUNET_YES ==
       GNUNET_CONFIGURATION_get_value_yesno (cfg,
                                             section,
-                                             "USER_SERVICE")))
+                                             "RUN_PER_USER")))
  {
    if (GNUNET_NO == start_user)
    {
@@ -2001,7 +2062,7 @@ setup_service (void *cls,
  if (GNUNET_YES ==
      GNUNET_CONFIGURATION_get_value_yesno (cfg,
                                            section,
-                                            "FORCESTART"))
+                                            "IMMEDIATE_START"))
  {
    sl->force_start = GNUNET_YES;
    if (GNUNET_YES ==
@@ -2015,7 +2076,7 @@ setup_service (void *cls,
    if (GNUNET_YES !=
        GNUNET_CONFIGURATION_get_value_yesno (cfg,
                                              section,
-                                              "AUTOSTART"))
+                                              "START_ON_DEMAND"))
      return;
  }
  if (0 >= (ret = get_server_addresses (section,
@@ -2024,7 +2085,7 @@ setup_service (void *cls,
                                        &addr_lens)))
    return;
  /* this will free (or capture) addrs[i] */
-  for (unsigned int i = 0; i < ret; i++)
+  for (unsigned int i = 0; i < (unsigned int) ret; i++)
    create_listen_socket (addrs[i],
                          addr_lens[i],
                          sl);
@@ -2049,6 +2110,8 @@ client_connect_cb (void *cls,
  /* All clients are considered to be of the "monitor" kind
   * (that is, they don't affect ARM shutdown).
   */
+  (void) cls;
+  (void) mq;
  GNUNET_SERVICE_client_mark_monitor (client);
  return client;
 }
@@ -2066,11 +2129,9 @@ client_disconnect_cb (void *cls,
                      struct GNUNET_SERVICE_Client *client,
                      void *app_ctx)
 {
-  struct ServiceList *sl;
+  (void) cls;
  GNUNET_assert (client == app_ctx);
+  for (struct ServiceList *sl = running_head; NULL != sl; sl = sl->next)
-  for (sl = running_head; NULL != sl; sl = sl->next)
    if (sl->killing_client == client)
      sl->killing_client = NULL;
 }
@@ -2090,6 +2151,7 @@ handle_monitor (void *cls,
 {
  struct GNUNET_SERVICE_Client *client = cls;
+  (void) message;
  /* FIXME: might want to start by letting monitor know about
     services that are already running */
  /* Removal is handled by the server implementation, internally. */
@@ -2105,7 +2167,7 @@ handle_monitor (void *cls,
 /**
 * Process arm requests.
 *
- * @param cls closure
+ * @param cls closure, NULL
 * @param serv the initialized service
 * @param c configuration to use
 */
@@ -2116,6 +2178,7 @@ run (void *cls,
 {
  struct ServiceList *sl;
+  (void) cls;
  cfg = c;
  service = serv;
  GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
@@ -2161,21 +2224,20 @@ run (void *cls,
  else
    final_option = GNUNET_CONFIGURATION_expand_dollar (cfg,
                                                       final_option);
-  if (GNUNET_YES ==
+  start_user = GNUNET_CONFIGURATION_get_value_yesno (cfg,
-      GNUNET_CONFIGURATION_get_value_yesno (cfg,
                                            "ARM",
-                                            "USER_ONLY"))
+                                            "START_USER_SERVICES");
-  {
+  start_system = GNUNET_CONFIGURATION_get_value_yesno (cfg,
-    GNUNET_break (GNUNET_YES == start_user);
-    start_system = GNUNET_NO;
-  }
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_yesno (cfg,
                                            "ARM",
-                                            "SYSTEM_ONLY"))
+                                            "START_SYSTEM_SERVICES");
+  if ( (GNUNET_NO == start_user) && 
+       (GNUNET_NO == start_system) )
  {
-    GNUNET_break (GNUNET_YES == start_system);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-    start_user = GNUNET_NO;
+        "Please configure either START_USER_SERVICES or START_SYSTEM_SERVICES or both.\n");
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = 1;
+    return;
  }
  GNUNET_CONFIGURATION_iterate_sections (cfg,
                                         &setup_service,
@@ -2202,7 +2264,6 @@ int
 main (int argc,
      char *const *argv)
 {
-  int ret;
  struct GNUNET_SIGNAL_Context *shc_chld;
  struct GNUNET_MQ_MessageHandler handlers[] = {
    GNUNET_MQ_hd_var_size (start,
@@ -2236,7 +2297,7 @@ main (int argc,
  shc_chld =
    GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD,
                                   &sighandler_child_death);
-  ret = GNUNET_SERVICE_run_ (argc,
+  if ( GNUNET_OK != GNUNET_SERVICE_run_ (argc,
                             argv,
                             "arm",
                             GNUNET_SERVICE_OPTION_MANUAL_SHUTDOWN,
@@ -2244,7 +2305,8 @@ main (int argc,
                             &client_connect_cb,
                             &client_disconnect_cb,
                             NULL,
-                             handlers);
+                             handlers))
+    global_ret = 2;
 #if HAVE_WAIT4
  if (NULL != wait_file)
  {
@@ -2261,7 +2323,7 @@ main (int argc,
  shc_chld = NULL;
  GNUNET_DISK_pipe_close (sigpipe);
  sigpipe = NULL;
-  return ret;
+  return global_ret;
 }
diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf
index b032cc95a..276b313b7 100644
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_api_data.conf
@@ -10,12 +10,12 @@ OPTIONS = -L ERROR
 #PREFIX = valgrind --tool=memcheck --leak-check=yes
 [resolver]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 PORT = 23355
 # PREFIX = valgrind
 [do-nothing]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 2223
 HOSTNAME = localhost
 BINARY = /will/be/overwritten/by/test_exponential_backoff
@@ -23,16 +23,16 @@ ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 [statistics]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [core]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [transport]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [ats]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [peerinfo]
-AUTOSTART = NO
+START_ON_DEMAND = NO
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 53b37b558..c85645b9d 100644
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -59,6 +59,7 @@ libgnunetatstesting_la_SOURCES = \
  ats-testing-experiment.c ats-testing-preferences.c
 libgnunetatstesting_la_LIBADD = \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
diff --git a/src/ats/ats.conf.in b/src/ats/ats.conf.in
index d9e867bde..53c0de0c5 100644
--- a/src/ats/ats.conf.in
+++ b/src/ats/ats.conf.in
@@ -1,5 +1,5 @@
 [ats]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @UNIXONLY@ PORT = 2098
 HOSTNAME = localhost
 BINARY = gnunet-service-ats
diff --git a/src/ats/ats_api_performance.c b/src/ats/ats_api_performance.c
index caa1da034..0c196ea43 100644
--- a/src/ats/ats_api_performance.c
+++ b/src/ats/ats_api_performance.c
@@ -849,7 +849,7 @@ GNUNET_ATS_performance_change_preference (struct GNUNET_ATS_PerformanceHandle *p
  count = 0;
  va_start(ap, peer);
  while (GNUNET_ATS_PREFERENCE_END !=
-         (kind = va_arg (ap, enum GNUNET_ATS_PreferenceKind) ))
+         (kind = GNUNET_VA_ARG_ENUM (ap, GNUNET_ATS_PreferenceKind) ))
  {
    switch (kind)
    {
@@ -875,7 +875,7 @@ GNUNET_ATS_performance_change_preference (struct GNUNET_ATS_PerformanceHandle *p
  count = 0;
  va_start(ap, peer);
  while (GNUNET_ATS_PREFERENCE_END != (kind =
-      va_arg (ap, enum GNUNET_ATS_PreferenceKind) ))
+      GNUNET_VA_ARG_ENUM (ap, GNUNET_ATS_PreferenceKind) ))
  {
    pi[count].preference_kind = htonl (kind);
    switch (kind)
@@ -927,7 +927,7 @@ GNUNET_ATS_performance_give_feedback (struct GNUNET_ATS_PerformanceHandle *ph,
  count = 0;
  va_start(ap, scope);
  while (GNUNET_ATS_PREFERENCE_END !=
-         (kind = va_arg (ap, enum GNUNET_ATS_PreferenceKind) ))
+         (kind = GNUNET_VA_ARG_ENUM (ap, GNUNET_ATS_PreferenceKind) ))
  {
    switch (kind)
    {
@@ -954,7 +954,7 @@ GNUNET_ATS_performance_give_feedback (struct GNUNET_ATS_PerformanceHandle *ph,
  count = 0;
  va_start(ap, scope);
  while (GNUNET_ATS_PREFERENCE_END != (kind =
-      va_arg (ap, enum GNUNET_ATS_PreferenceKind) ))
+      GNUNET_VA_ARG_ENUM (ap, GNUNET_ATS_PreferenceKind) ))
  {
    pi[count].preference_kind = htonl (kind);
    switch (kind)
diff --git a/src/ats/plugin_ats_proportional.c b/src/ats/plugin_ats_proportional.c
index b4ca70dc7..08fb7a9a7 100644
--- a/src/ats/plugin_ats_proportional.c
+++ b/src/ats/plugin_ats_proportional.c
@@ -1005,7 +1005,7 @@ GAS_proportional_address_property_changed (void *solver,
 static void
 GAS_proportional_address_add (void *solver,
                              struct ATS_Address *address,
-                              enum GNUNET_ATS_Network_Type network)
+                              uint32_t network)
 {
  struct GAS_PROPORTIONAL_Handle *s = solver;
  struct Network *net;
diff --git a/src/auction/auction.conf b/src/auction/auction.conf
index 6ca35896b..deb9ac1fc 100644
--- a/src/auction/auction.conf
+++ b/src/auction/auction.conf
@@ -1,4 +1,4 @@
 [auction]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 BINARY = gnunet-service-auction
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-auction.sock
diff --git a/src/cadet/cadet.conf.in b/src/cadet/cadet.conf.in
index d50e168f0..2f4c6a6db 100644
--- a/src/cadet/cadet.conf.in
+++ b/src/cadet/cadet.conf.in
@@ -1,6 +1,6 @@
 [cadet]
-FORCESTART = YES
+IMMEDIATE_START = YES
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2096
 HOSTNAME = localhost
 BINARY = gnunet-service-cadet
diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c
index 0cabb86e9..04a595a7b 100644
--- a/src/cadet/gnunet-cadet.c
+++ b/src/cadet/gnunet-cadet.c
@@ -373,6 +373,7 @@ send_echo (void *cls)
 static void
 request_dump (void *cls)
 {
+  job = NULL;
  GNUNET_CADET_request_dump (mh);
  GNUNET_SCHEDULER_shutdown ();
 }
diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c
index 668b4ddb5..38037e92f 100644
--- a/src/cadet/gnunet-service-cadet.c
+++ b/src/cadet/gnunet-service-cadet.c
@@ -874,7 +874,7 @@ path_info_iterator (void *cls,
 {
  struct GNUNET_MQ_Handle *mq = cls;
  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_MessageHeader *resp;
+  struct GNUNET_CADET_LocalInfoPeer *resp;
  struct GNUNET_PeerIdentity *id;
  uint16_t path_size;
  unsigned int i;
diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf
index f2308df29..5ad67fec2 100644
--- a/src/cadet/test_cadet.conf
+++ b/src/cadet/test_cadet.conf
@@ -68,33 +68,33 @@ NO_IO = YES
 WORKBITS = 0
 [hostlist]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [fs]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [vpn]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [revocation]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [gns]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [namestore]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [namecache]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [topology]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
diff --git a/src/consensus/consensus.conf.in b/src/consensus/consensus.conf.in
index 2afee04db..b0fbcaf5a 100644
--- a/src/consensus/consensus.conf.in
+++ b/src/consensus/consensus.conf.in
@@ -1,5 +1,5 @@
 [consensus]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2103
 HOSTNAME = localhost
 BINARY = gnunet-service-consensus
diff --git a/src/consensus/test_consensus.conf b/src/consensus/test_consensus.conf
index 6cb0885b0..fa42c3c1a 100644
--- a/src/consensus/test_consensus.conf
+++ b/src/consensus/test_consensus.conf
@@ -17,22 +17,22 @@ BINARY = gnunet-service-evil-consensus
 RESOURCE_DIAGNOSTICS = resource.log.${PEERID:-master}
 [core]
-FORCESTART = YES
+IMMEDIATE_START = YES
 [revocation]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [fs]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [gns]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [zonemaster]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [hostlist]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [cadet]
 #PREFIX = valgrind
@@ -54,13 +54,13 @@ OPERATION_TIMEOUT = 60 s
 MAX_OPEN_FDS = 4096
 [hostlist]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [revocation]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [nat]
 # Use addresses from the local network interfaces (inluding loopback, but also others)
diff --git a/src/conversation/conversation.conf.in b/src/conversation/conversation.conf.in
index e966ed6d9..b28fb6e1f 100644
--- a/src/conversation/conversation.conf.in
+++ b/src/conversation/conversation.conf.in
@@ -1,5 +1,5 @@
 [conversation]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 BINARY = gnunet-service-conversation
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-conversation.sock
 HOSTNAME = localhost
diff --git a/src/core/core.conf.in b/src/core/core.conf.in
index 3f388632e..2b20a109a 100644
--- a/src/core/core.conf.in
+++ b/src/core/core.conf.in
@@ -1,5 +1,5 @@
 [core]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2092
 HOSTNAME = localhost
 BINARY = gnunet-service-core
diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf
index 83928d04a..ad6d4dc60 100644
--- a/src/core/test_core_api_send_to_self.conf
+++ b/src/core/test_core_api_send_to_self.conf
@@ -7,7 +7,7 @@ WAN_QUOTA_IN = 104857600
 WAN_QUOTA_OUT = 104757600
 [test-sts]
-FORCESTART = YES
+IMMEDIATE_START = YES
 PORT = 9252
 HOSTNAME = localhost
 BINARY = test_core_api_send_to_self
diff --git a/src/credential/credential.conf.in b/src/credential/credential.conf.in
index 71f3066ca..d5a0b1c88 100644
--- a/src/credential/credential.conf.in
+++ b/src/credential/credential.conf.in
@@ -1,5 +1,5 @@
 [credential]
 BINARY = gnunet-service-credential
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-credential.sock
-USER_SERVICE = YES
+RUN_PER_USER = YES
-OPTIONS = -L DEBUG
-\ No newline at end of file
+OPTIONS = -L DEBUG
diff --git a/src/credential/test_credential_lookup.conf b/src/credential/test_credential_lookup.conf
index bd464a1f4..39f68c944 100644
--- a/src/credential/test_credential_lookup.conf
+++ b/src/credential/test_credential_lookup.conf
@@ -4,13 +4,13 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-credential-peer-1/
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [transport]
 PLUGINS =
 [credential]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/credlog
 [rest]
@@ -18,7 +18,7 @@ PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/r
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
-AUTOSTART = YES
+START_ON_DEMAND = YES
 AUTO_IMPORT_PKEY = YES
 MAX_PARALLEL_BACKGROUND_QUERIES = 10
 DEFAULT_LOOKUP_TIMEOUT = 15 s
diff --git a/src/datastore/datastore.conf.in b/src/datastore/datastore.conf.in
index 721c865c8..21d24bb52 100644
--- a/src/datastore/datastore.conf.in
+++ b/src/datastore/datastore.conf.in
@@ -1,5 +1,5 @@
 [datastore]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-datastore.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index 80960c676..fc1706400 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -855,9 +855,10 @@ sqlite_plugin_get_zero_anonymity (void *cls,
                                  void *proc_cls)
 {
  struct Plugin *plugin = cls;
+  uint32_t type32 = type;
  struct GNUNET_SQ_QueryParam params[] = {
    GNUNET_SQ_query_param_uint64 (&next_uid),
-    GNUNET_SQ_query_param_uint32 (&type),
+    GNUNET_SQ_query_param_uint32 (&type32),
    GNUNET_SQ_query_param_end
  };
diff --git a/src/datastore/test_defaults.conf b/src/datastore/test_defaults.conf
index 08e630eb0..1f971de8f 100644
--- a/src/datastore/test_defaults.conf
+++ b/src/datastore/test_defaults.conf
@@ -4,7 +4,7 @@
 [datastore]
 PORT = 22654
 QUOTA = 1 MB
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [nse]
 WORKBITS = 1
diff --git a/src/dht/dht.conf.in b/src/dht/dht.conf.in
index f828b725f..405ef1917 100644
--- a/src/dht/dht.conf.in
+++ b/src/dht/dht.conf.in
@@ -1,6 +1,6 @@
 [dht]
-FORCESTART = YES
+IMMEDIATE_START = YES
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2095
 HOSTNAME = localhost
 BINARY = gnunet-service-dht
diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index a541e8443..0e546cf68 100644
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -4,8 +4,8 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_2dtorus/
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 [dhtcache]
 QUOTA = 1 MB
@@ -28,7 +28,7 @@ WAN_QUOTA_OUT = 1 GB
 OVERLAY_TOPOLOGY = 2D_TORUS
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKDELAY = 500 ms
 INTERVAL = 60 s
 WORKBITS = 0
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index a2c1829c6..cb875fad4 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -36,9 +36,9 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKBITS = 1
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index b4164077f..230aa0fa4 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -33,9 +33,9 @@ EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKBITS = 1
diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index 5368b0baf..62e337ef2 100644
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.conf
@@ -4,8 +4,8 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_line/
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 [dhtcache]
 QUOTA = 1 MB
@@ -32,7 +32,7 @@ OVERLAY_TOPOLOGY = LINE
 plugins = unix
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKDELAY = 500 ms
 INTERVAL = 60 s
 WORKBITS = 0
diff --git a/src/dht/test_dht_monitor.conf b/src/dht/test_dht_monitor.conf
index c0d457e89..feefc2f5e 100644
--- a/src/dht/test_dht_monitor.conf
+++ b/src/dht/test_dht_monitor.conf
@@ -31,9 +31,9 @@ RETURN_LOCAL_ADDRESSES = YES
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKBITS = 1
diff --git a/src/dht/test_dht_multipeer.conf b/src/dht/test_dht_multipeer.conf
index 4296d783e..ac35664c4 100644
--- a/src/dht/test_dht_multipeer.conf
+++ b/src/dht/test_dht_multipeer.conf
@@ -2,8 +2,8 @@
 @INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 [dhtcache]
 QUOTA = 1 MB
@@ -34,7 +34,7 @@ EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = YES
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKDELAY = 500 ms
 INTERVAL = 60 s
 WORKBITS = 0
diff --git a/src/dht/test_dht_tools.conf b/src/dht/test_dht_tools.conf
index 46d206448..05f7cc0e6 100644
--- a/src/dht/test_dht_tools.conf
+++ b/src/dht/test_dht_tools.conf
@@ -30,128 +30,128 @@ EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKBITS = 1
 # Configuration to disable autostarting of
 # all services above the 'core' level.
 # (including resolver)
 [dns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [cadet]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [datastore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [dv]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [consensus]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [resolver]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [namestore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [namecache]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [identity]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [revocation]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [conversation]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [peerstore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [psycstore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [gns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [regex]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [set]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [scalarproduct-bob]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [scalarproduct-alice]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [social]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [psyc]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [rps]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [multicast]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [sensordashboard]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [sensor]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 # Configuration file that can be included to prevent ANY of the usual
-# FORCESTART = YES to be set.  Also disables NSE POW calculation.
+# IMMEDIATE_START = YES to be set.  Also disables NSE POW calculation.
 #
 # This configuration is included from various configuration test files.
-# Whenever a new service is added that has FORCESTART = YES for
+# Whenever a new service is added that has IMMEDIATE_START = YES for
 # production should be disabled for (most) test suites, the option should
 # be added here instead of all over the place ;-).
 [core]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [fs]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [dht]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [cadet]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [nse]
-FORCESTART = NO
+IMMEDIATE_START = NO
 WORKBITS = 0
 [revocation]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [topology]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [hostlist]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [gns]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [zonemaster]
-FORCESTART = NO
-\ No newline at end of file
+IMMEDIATE_START = NO
diff --git a/src/dns/dns.conf.in b/src/dns/dns.conf.in
index 000b73cf1..39f260813 100644
--- a/src/dns/dns.conf.in
+++ b/src/dns/dns.conf.in
@@ -1,5 +1,5 @@
 [dns]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 HOSTNAME = localhost
 BINARY = gnunet-service-dns
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-dns.sock
diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c
index c191f0531..6b75fd0f4 100644
--- a/src/dns/gnunet-service-dns.c
+++ b/src/dns/gnunet-service-dns.c
@@ -1097,7 +1097,10 @@ run (void *cls,
  helper_argv[0] = GNUNET_strdup ("gnunet-dns");
  if (GNUNET_SYSERR ==
-      GNUNET_CONFIGURATION_get_value_string (cfg, "dns", "IFNAME", &ifc_name))
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "dns",
+                                             "IFNAME",
+                                             &ifc_name))
  {
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                "No entry 'IFNAME' in configuration!\n");
@@ -1106,7 +1109,9 @@ run (void *cls,
  }
  helper_argv[1] = ifc_name;
  if ( (GNUNET_SYSERR ==
-        GNUNET_CONFIGURATION_get_value_string (cfg, "dns", "IPV6ADDR",
+        GNUNET_CONFIGURATION_get_value_string (cfg,
+                                               "dns",
+                                               "IPV6ADDR",
                                               &ipv6addr)) )
  {
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -1116,7 +1121,9 @@ run (void *cls,
  }
  helper_argv[2] = ipv6addr;
  if (GNUNET_SYSERR ==
-      GNUNET_CONFIGURATION_get_value_string (cfg, "dns", "IPV6PREFIX",
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "dns",
+                                             "IPV6PREFIX",
                                             &ipv6prefix))
  {
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -1127,7 +1134,9 @@ run (void *cls,
  helper_argv[3] = ipv6prefix;
  if (GNUNET_SYSERR ==
-      GNUNET_CONFIGURATION_get_value_string (cfg, "dns", "IPV4ADDR",
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "dns",
+                                             "IPV4ADDR",
                                             &ipv4addr))
  {
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/dv/dv.conf.in b/src/dv/dv.conf.in
index 5d9a960f5..145c58be6 100644
--- a/src/dv/dv.conf.in
+++ b/src/dv/dv.conf.in
@@ -1,5 +1,5 @@
 [dv]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-dv
diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index ff02d4a5e..307921ac4 100644
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -6,11 +6,11 @@ PLUGINS = tcp dv
 #PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high
 [dv]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 # PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high
 [set]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 # PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high
 [core]
diff --git a/src/fragmentation/test_fragmentation_data.conf b/src/fragmentation/test_fragmentation_data.conf
index c236f689c..54ad21ff9 100644
--- a/src/fragmentation/test_fragmentation_data.conf
+++ b/src/fragmentation/test_fragmentation_data.conf
@@ -1,5 +1,5 @@
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in
index d46de387f..92bcf776d 100644
--- a/src/fs/fs.conf.in
+++ b/src/fs/fs.conf.in
@@ -1,6 +1,6 @@
 [fs]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
-FORCESTART = YES
+IMMEDIATE_START = YES
 INDEXDB = $GNUNET_DATA_HOME/fs/idxinfo.lst
 RESPECT = $GNUNET_DATA_HOME/fs/credit/
 STATE_DIR = $GNUNET_DATA_HOME/fs/persistence/
@@ -61,7 +61,7 @@ MAX_CADET_CLIENTS = 128
 [gnunet-auto-share]
 BINARY = gnunet-auto-share
-FORCESTART = NO
+IMMEDIATE_START = NO
 # Note: MUST specify path to auto-share directory and CAN specify other options
 # to gnunet-auto-share here!
diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c
index 0857110b1..9b783ba93 100644
--- a/src/fs/fs_api.c
+++ b/src/fs/fs_api.c
@@ -3112,7 +3112,7 @@ GNUNET_FS_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
  ret->max_parallel_requests = DEFAULT_MAX_PARALLEL_REQUESTS;
  ret->avg_block_latency = GNUNET_TIME_UNIT_MINUTES;    /* conservative starting point */
  va_start (ap, flags);
-  while (GNUNET_FS_OPTIONS_END != (opt = va_arg (ap, enum GNUNET_FS_OPTIONS)))
+  while (GNUNET_FS_OPTIONS_END != (opt = GNUNET_VA_ARG_ENUM (ap,GNUNET_FS_OPTIONS)))
  {
    switch (opt)
    {
diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index 01cac95b8..c99674798 100644
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/fs/fs_test_lib_data.conf
@@ -11,7 +11,7 @@ QUOTA = 2 GB
 #PLUGIN = heap
 #
 [fs]
-FORCESTART = YES
+IMMEDIATE_START = YES
 [testbed]
 OVERLAY_TOPOLOGY = CLIQUE
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c
index 8c431532f..f1a115cb6 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -1601,7 +1601,7 @@ called_from_on_demand:
      GNUNET_BLOCK_get_key (GSF_block_ctx, type, data, size, &query))
  {
    GNUNET_break (0);
-    GNUNET_DATASTORE_remove (GSF_dsh, key, size, data, -1, -1,
+    GNUNET_DATASTORE_remove (GSF_dsh, key, size, data, UINT_MAX, UINT_MAX,
                             NULL, NULL);
    start_local_query (pr,
                       uid + 1 /* next_uid */,
diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in
index e3a8db141..906282200 100755
--- a/src/fs/test_gnunet_fs_psd.py.in
+++ b/src/fs/test_gnunet_fs_psd.py.in
@@ -22,16 +22,23 @@ import subprocess
 import re
 import shutil
 try:
+    # Python 2.7
    reload
 except NameError:
-    # python3.4:
+    try:
-    from importlib import reload
+        # Python 3.4+:
+        from importlib import reload
+    except ImportError:
+        # Python 3.0 - 3.3
+        from imp import reload
+reload(sys)
 # Force encoding to utf-8, as this test otherwise fails
-# on some systems (see #5094).
+# on some systems (see #5094). In Python 3+ there is no attribute 
-reload(sys)
+# sys.setdefaultencoding anymore. 
-sys.setdefaultencoding('utf8')
+if (3 < sys.version_info[0]):
+    sys.setdefaultencoding('utf8')
 srcdir = "../.."
 gnunet_pyexpect_dir = os.path.join(srcdir, "contrib/scripts")
@@ -53,6 +60,12 @@ elif os.name == 'nt':
    unindex = './gnunet-unindex.exe'
    search = './gnunet-search.exe'
+if "GNUNET_PREFIX" in os.environ:
+    pass
+else:
+    print("You need to export GNUNET_PREFIX")
+    sys.exit(1)
+    
 if os.name == "nt":
    shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-psd"), True)
 else:
diff --git a/src/gns/gns-helper-service-w32.conf b/src/gns/gns-helper-service-w32.conf
index 48652173a..a7b9fdd70 100644
--- a/src/gns/gns-helper-service-w32.conf
+++ b/src/gns/gns-helper-service-w32.conf
@@ -1,4 +1,4 @@
 [gns-helper-service-w32]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 BINARY = gnunet-gns-helper-service-w32
 PORT = 5353
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index f7682cda7..2e6a02b07 100644
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -1,6 +1,6 @@
 [gns]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
-FORCESTART = YES
+IMMEDIATE_START = YES
 HOSTNAME = localhost
 BINARY = gnunet-service-gns
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-gns.sock
@@ -20,7 +20,7 @@ MAX_PARALLEL_BACKGROUND_QUERIES = 1000
 # we will ask gnunet-service-dns to pass DNS queries to us. Otherwise,
 # we only answer GNS queries via the API (which itself may be
 # called via NSS or other mechanisms).
-INTERCEPT_DNS = YES
+INTERCEPT_DNS = NO
 # PREFIX = valgrind --leak-check=full --track-origins=yes
@@ -30,8 +30,8 @@ INTERCEPT_DNS = YES
 [gns-proxy]
 BINARY = gnunet-gns-proxy
-AUTOSTART = NO
+START_ON_DEMAND = NO
-USER_SERVICE = YES
+RUN_PER_USER = YES
 # Where is the certificate for the GNS proxy stored?
 PROXY_CACERT = $GNUNET_DATA_HOME/gns/gns_ca_cert.pem
@@ -40,8 +40,8 @@ PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
 [dns2gns]
 BINARY = gnunet-dns2gns
-AUTOSTART = NO
+START_ON_DEMAND = NO
-USER_SERVICE = YES
+RUN_PER_USER = YES
 # -d: DNS resolver to use, -s: suffix to use, -f: fcfs suffix to use
 OPTIONS = -d 8.8.8.8
diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index 8264bf715..0ec9209da 100644
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -300,17 +300,21 @@ GNUNET_GNS_disconnect (struct GNUNET_GNS_Handle *handle)
 * Cancel pending lookup request
 *
 * @param lr the lookup request to cancel
+ * @return closure from the lookup result processor
 */
-void
+void *
 GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr)
 {
  struct GNUNET_GNS_Handle *handle = lr->gns_handle;
+  void *ret;
  GNUNET_CONTAINER_DLL_remove (handle->lookup_head,
                               handle->lookup_tail,
                               lr);
  GNUNET_MQ_discard (lr->env);
+  ret = lr->proc_cls;
  GNUNET_free (lr);
+  return ret;
 }
diff --git a/src/gns/gns_tld_api.c b/src/gns/gns_tld_api.c
index b053aa0c1..825b51d06 100644
--- a/src/gns/gns_tld_api.c
+++ b/src/gns/gns_tld_api.c
@@ -317,10 +317,13 @@ GNUNET_GNS_lookup_with_tld (struct GNUNET_GNS_Handle *handle,
 * Cancel pending lookup request
 *
 * @param ltr the lookup request to cancel
+ * @return closure from the lookup result processor
 */
-void
+void *
 GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr)
 {
+  void *ret = ltr->lookup_proc_cls;
+  
  if (NULL != ltr->id_op)
  {
    GNUNET_IDENTITY_ego_lookup_cancel (ltr->id_op);
@@ -333,6 +336,7 @@ GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr)
  }
  GNUNET_free (ltr->name);
  GNUNET_free (ltr);
+  return ret;
 }
 /* end of gns_tld_api.c */
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 9a405c49b..d66f5c658 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -1,6 +1,6 @@
 /*
     This file is part of GNUnet.
-     Copyright (C) 2012-2014 GNUnet e.V.
+     Copyright (C) 2012-2018 GNUnet e.V.
     GNUnet is free software: you can redistribute it and/or modify it
     under the terms of the GNU Affero General Public License as published
@@ -46,14 +46,6 @@
 #include "gns.h"
-/**
- * FIXME: GnuTLS right now sometimes rejects valid certs, so as a
- * VERY temporary workaround we just WARN the user instead of 
- * dropping the page.  THIS SHOULD NOT BE USED IN PRODUCTION,
- * set to 1 in production!!! FIXME!!!
- */
-#define FIXED_CERT_VALIDATION_BUG 0
 /**
 * Default Socks5 listen port.
@@ -1079,10 +1071,8 @@ check_ssl_certificate (struct Socks5Request *s5r)
                    certdn,
                    name,
                    rc);
-#if FIXED_CERT_VALIDATION_BUG
        gnutls_x509_crt_deinit (x509_cert);
        return GNUNET_SYSERR;
-#endif
      }
    }
    else
@@ -1197,6 +1187,15 @@ curl_check_hdr (void *buffer,
                             s5r->domain);
          continue;
        }
+        else if ( ('.' == cookie_domain[0]) &&
+                  (0 == strcmp (&cookie_domain[1],
+                                s5r->leho)) )
+        {
+          offset += sprintf (new_cookie_hdr + offset,
+                             " domain=.%s;",
+                             s5r->domain);
+          continue;
+        }
        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                    _("Cookie domain `%s' supplied by server is invalid\n"),
                    tok);
@@ -1723,12 +1722,6 @@ con_val_iter (void *cls,
                         key)) &&
       (NULL != s5r->leho) )
    value = s5r->leho;
-  if (0 == strcasecmp (MHD_HTTP_HEADER_CONTENT_LENGTH,
-                       key))
-    return MHD_YES;
-  if (0 == strcasecmp (MHD_HTTP_HEADER_ACCEPT_ENCODING,
-                       key))
-    return MHD_YES;
  GNUNET_asprintf (&hdr,
                   "%s: %s",
                   key,
@@ -1955,7 +1948,7 @@ create_response (void *cls,
                        s5r);
      {
        const char *us;
-        long upload_size;
+        long upload_size = 0;
        us = MHD_lookup_connection_value (con,
                                          MHD_HEADER_KIND,
@@ -1996,7 +1989,8 @@ create_response (void *cls,
        us = MHD_lookup_connection_value (con,
                                          MHD_HEADER_KIND,
                                          MHD_HTTP_HEADER_CONTENT_LENGTH);
-        if ( (NULL != us) && (1 == sscanf (us,
+        if ( (NULL != us) &&
+             (1 == sscanf (us,
                           "%ld",
                           &upload_size)) &&
             (upload_size >= 0) )
@@ -2026,20 +2020,41 @@ create_response (void *cls,
      curl_easy_setopt (s5r->curl,
                        CURLOPT_CUSTOMREQUEST,
                        "OPTIONS");
+      curl_easy_setopt (s5r->curl,
+                        CURLOPT_WRITEFUNCTION,
+                        &curl_download_cb);
+      curl_easy_setopt (s5r->curl,
+                        CURLOPT_WRITEDATA,
+                        s5r);
    }
    else if (0 == strcasecmp (meth,
-                              MHD_HTTP_METHOD_GET))
+                              MHD_HTTP_METHOD_GET))
    {
      s5r->state = SOCKS5_SOCKET_DOWNLOAD_STARTED;
      curl_easy_setopt (s5r->curl,
-                        CURLOPT_HTTPGET,
+                        CURLOPT_HTTPGET,
-                        1L);
+                        1L);
      curl_easy_setopt (s5r->curl,
-                        CURLOPT_WRITEFUNCTION,
+                        CURLOPT_WRITEFUNCTION,
-                        &curl_download_cb);
+                        &curl_download_cb);
      curl_easy_setopt (s5r->curl,
-                        CURLOPT_WRITEDATA,
+                        CURLOPT_WRITEDATA,
-                        s5r);
+                        s5r);
+    }
+    else if (0 == strcasecmp (meth,
+                              MHD_HTTP_METHOD_DELETE))
+    {
+      s5r->state = SOCKS5_SOCKET_DOWNLOAD_STARTED;
+      curl_easy_setopt (s5r->curl,
+                        CURLOPT_CUSTOMREQUEST,
+                        "DELETE");
+      curl_easy_setopt (s5r->curl,
+                        CURLOPT_WRITEFUNCTION,
+                        &curl_download_cb);
+      curl_easy_setopt (s5r->curl,
+                        CURLOPT_WRITEDATA,
+                        s5r);
    }
    else
    {
@@ -2054,46 +2069,46 @@ create_response (void *cls,
    if (0 == strcasecmp (ver, MHD_HTTP_VERSION_1_0))
    {
      curl_easy_setopt (s5r->curl,
-                        CURLOPT_HTTP_VERSION,
+                        CURLOPT_HTTP_VERSION,
-                        CURL_HTTP_VERSION_1_0);
+                        CURL_HTTP_VERSION_1_0);
    }
    else if (0 == strcasecmp (ver, MHD_HTTP_VERSION_1_1))
    {
      curl_easy_setopt (s5r->curl,
-                        CURLOPT_HTTP_VERSION,
+                        CURLOPT_HTTP_VERSION,
-                        CURL_HTTP_VERSION_1_1);
+                        CURL_HTTP_VERSION_1_1);
    }
    else
    {
      curl_easy_setopt (s5r->curl,
-                        CURLOPT_HTTP_VERSION,
+                        CURLOPT_HTTP_VERSION,
-                        CURL_HTTP_VERSION_NONE);
+                        CURL_HTTP_VERSION_NONE);
    }
    if (HTTPS_PORT == s5r->port)
    {
      curl_easy_setopt (s5r->curl,
-                        CURLOPT_USE_SSL,
+                        CURLOPT_USE_SSL,
-                        CURLUSESSL_ALL);
+                        CURLUSESSL_ALL);
      if (NULL != s5r->dane_data)
        curl_easy_setopt (s5r->curl,
-                          CURLOPT_SSL_VERIFYPEER,
+                          CURLOPT_SSL_VERIFYPEER,
-                          0L);
+                          0L);
      else
        curl_easy_setopt (s5r->curl,
-                          CURLOPT_SSL_VERIFYPEER,
+                          CURLOPT_SSL_VERIFYPEER,
-                          1L);
+                          1L);
      /* Disable cURL checking the hostname, as we will check ourselves
         as only we have the domain name or the LEHO or the DANE record */
      curl_easy_setopt (s5r->curl,
-                        CURLOPT_SSL_VERIFYHOST,
+                        CURLOPT_SSL_VERIFYHOST,
-                        0L);
+                        0L);
    }
    else
    {
      curl_easy_setopt (s5r->curl,
-                        CURLOPT_USE_SSL,
+                        CURLOPT_USE_SSL,
-                        CURLUSESSL_NONE);
+                        CURLUSESSL_NONE);
    }
    if (CURLM_OK !=
@@ -2121,14 +2136,14 @@ create_response (void *cls,
  {
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                "Processing %u bytes UPLOAD\n",
-                (unsigned int) *upload_data_size);
+                (unsigned int) *upload_data_size);
    /* FIXME: This must be set or a header with Transfer-Encoding: chunked. Else
     * upload callback is not called!
     */
    curl_easy_setopt (s5r->curl,
-                      CURLOPT_POSTFIELDSIZE,
+                      CURLOPT_POSTFIELDSIZE,
-                      *upload_data_size);
+                      *upload_data_size);
    left = GNUNET_MIN (*upload_data_size,
                       sizeof (s5r->io_buf) - s5r->io_len);
@@ -2142,7 +2157,7 @@ create_response (void *cls,
    {
      s5r->curl_paused = GNUNET_NO;
      curl_easy_pause (s5r->curl,
-                       CURLPAUSE_CONT);
+                       CURLPAUSE_CONT);
    }
    return MHD_YES;
  }
@@ -2522,9 +2537,9 @@ load_file (const char* filename,
  if (GNUNET_OK !=
      GNUNET_DISK_file_size (filename,
-                             &fsize,
+                             &fsize,
                             GNUNET_YES,
-                             GNUNET_YES))
+                             GNUNET_YES))
    return NULL;
  if (fsize > MAX_PEM_SIZE)
    return NULL;
@@ -2557,7 +2572,7 @@ load_key_from_file (gnutls_x509_privkey_t key,
  int ret;
  key_data.data = load_file (keyfile,
-                             &key_data.size);
+                             &key_data.size);
  if (NULL == key_data.data)
    return GNUNET_SYSERR;
  ret = gnutls_x509_privkey_import (key, &key_data,
@@ -2588,17 +2603,17 @@ load_cert_from_file (gnutls_x509_crt_t crt,
  int ret;
  cert_data.data = load_file (certfile,
-                              &cert_data.size);
+                              &cert_data.size);
  if (NULL == cert_data.data)
    return GNUNET_SYSERR;
  ret = gnutls_x509_crt_import (crt,
-                                &cert_data,
+                                &cert_data,
                                GNUTLS_X509_FMT_PEM);
  if (GNUTLS_E_SUCCESS != ret)
  {
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                _("Unable to import certificate from `%s'\n"),
-                certfile);
+                certfile);
  }
  GNUNET_free_non_null (cert_data.data);
  return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK;
@@ -2629,26 +2644,26 @@ generate_gns_certificate (const char *name)
  GNUNET_break (GNUTLS_E_SUCCESS == gnutls_x509_crt_set_key (request, proxy_ca.key));
  pgc = GNUNET_new (struct ProxyGNSCertificate);
  gnutls_x509_crt_set_dn_by_oid (request,
-                                 GNUTLS_OID_X520_COUNTRY_NAME,
+                                 GNUTLS_OID_X520_COUNTRY_NAME,
                                 0,
-                                 "ZZ",
+                                 "ZZ",
-                                 strlen ("ZZ"));
+                                 strlen ("ZZ"));
  gnutls_x509_crt_set_dn_by_oid (request,
-                                 GNUTLS_OID_X520_ORGANIZATION_NAME,
+                                 GNUTLS_OID_X520_ORGANIZATION_NAME,
                                 0,
-                                 "GNU Name System",
+                                 "GNU Name System",
-                                 strlen ("GNU Name System"));
+                                 strlen ("GNU Name System"));
  gnutls_x509_crt_set_dn_by_oid (request,
-                                 GNUTLS_OID_X520_COMMON_NAME,
+                                 GNUTLS_OID_X520_COMMON_NAME,
                                 0,
-                                 name,
+                                 name,
-                                 strlen (name));
+                                 strlen (name));
  GNUNET_break (GNUTLS_E_SUCCESS ==
-                gnutls_x509_crt_set_version (request,
+                gnutls_x509_crt_set_version (request,
-                                             3));
+                                             3));
  gnutls_rnd (GNUTLS_RND_NONCE,
-              &serial,
+              &serial,
-              sizeof (serial));
+              sizeof (serial));
  gnutls_x509_crt_set_serial (request,
                              &serial,
                              sizeof (serial));
@@ -2663,20 +2678,20 @@ generate_gns_certificate (const char *name)
  gnutls_x509_crt_set_expiration_time (request,
                                       etime);
  gnutls_x509_crt_sign2 (request,
-                         proxy_ca.cert,
+                         proxy_ca.cert,
-                         proxy_ca.key,
+                         proxy_ca.key,
-                         GNUTLS_DIG_SHA512,
+                         GNUTLS_DIG_SHA512,
-                         0);
+                         0);
  key_buf_size = sizeof (pgc->key);
  cert_buf_size = sizeof (pgc->cert);
  gnutls_x509_crt_export (request,
-                          GNUTLS_X509_FMT_PEM,
+                          GNUTLS_X509_FMT_PEM,
                          pgc->cert,
-                          &cert_buf_size);
+                          &cert_buf_size);
  gnutls_x509_privkey_export (proxy_ca.key,
-                              GNUTLS_X509_FMT_PEM,
+                              GNUTLS_X509_FMT_PEM,
                              pgc->key,
-                              &key_buf_size);
+                              &key_buf_size);
  gnutls_x509_crt_deinit (request);
  return pgc;
 }
@@ -3120,7 +3135,7 @@ do_s5r_read (void *cls)
  tc = GNUNET_SCHEDULER_get_task_context ();
  if ( (NULL != tc->read_ready) &&
       (GNUNET_NETWORK_fdset_isset (tc->read_ready,
-                                    s5r->sock)) )
+                                    s5r->sock)) )
  {
    rlen = GNUNET_NETWORK_socket_recv (s5r->sock,
                                       &s5r->rbuf[s5r->rbuf_len],
@@ -3247,7 +3262,7 @@ do_s5r_read (void *cls)
                                          *dom_len);
            GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                        "Requested connection is to http%s://%s:%d\n",
-                        (HTTPS_PORT == s5r->port) ? "s" : "",
+                        (HTTPS_PORT == s5r->port) ? "s" : "",
                        s5r->domain,
                        ntohs (*port));
            s5r->state = SOCKS5_RESOLVING;
@@ -3319,21 +3334,21 @@ do_accept (void *cls)
    ltask4 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
                                            lsock,
                                            &do_accept,
-                                            lsock);
+                                            lsock);
  else if (lsock == lsock6)
    ltask6 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
                                            lsock,
                                            &do_accept,
-                                            lsock);
+                                            lsock);
  else
    GNUNET_assert (0);
  s = GNUNET_NETWORK_socket_accept (lsock,
-                                    NULL,
+                                    NULL,
-                                    NULL);
+                                    NULL);
  if (NULL == s)
  {
    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
-                         "accept");
+                         "accept");
    return;
  }
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -3347,7 +3362,7 @@ do_accept (void *cls)
  s5r->rtask = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
                                              s5r->sock,
                                              &do_s5r_read,
-                                              s5r);
+                                              s5r);
 }
@@ -3445,7 +3460,7 @@ bind_v4 ()
    return NULL;
  if (GNUNET_OK !=
      GNUNET_NETWORK_socket_bind (ls,
-                                  (const struct sockaddr *) &sa4,
+                                  (const struct sockaddr *) &sa4,
                                  sizeof (sa4)))
  {
    eno = errno;
@@ -3482,7 +3497,7 @@ bind_v6 ()
    return NULL;
  if (GNUNET_OK !=
      GNUNET_NETWORK_socket_bind (ls,
-                                  (const struct sockaddr *) &sa6,
+                                  (const struct sockaddr *) &sa6,
                                  sizeof (sa6)))
  {
    eno = errno;
@@ -3537,8 +3552,8 @@ run (void *cls,
    cafile = cafile_cfg;
  }
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Using `%s' as CA\n",
+              "Using `%s' as CA\n",
-              cafile);
+              cafile);
  gnutls_global_init ();
  gnutls_x509_crt_init (&proxy_ca.cert);
@@ -3678,19 +3693,19 @@ main (int argc,
 {
  struct GNUNET_GETOPT_CommandLineOption options[] = {
    GNUNET_GETOPT_option_uint16 ('p',
-                                 "port",
+                                 "port",
-                                 NULL,
+                                 NULL,
-                                 gettext_noop ("listen on specified port (default: 7777)"),
+                                 gettext_noop ("listen on specified port (default: 7777)"),
-                                 &port),
+                                 &port),
    GNUNET_GETOPT_option_string ('a',
                                 "authority",
                                 NULL,
                                 gettext_noop ("pem file to use as CA"),
                                 &cafile_opt),
    GNUNET_GETOPT_option_flag ('6',
-                               "disable-ivp6",
+                               "disable-ivp6",
-                               gettext_noop ("disable use of IPv6"),
+                               gettext_noop ("disable use of IPv6"),
-                               &disable_v6),
+                               &disable_v6),
    GNUNET_GETOPT_OPTION_END
  };
@@ -3701,7 +3716,7 @@ main (int argc,
  if (GNUNET_OK !=
      GNUNET_STRINGS_get_utf8_args (argc, argv,
-                                    &argc, &argv))
+                                    &argc, &argv))
    return 2;
  GNUNET_log_setup ("gnunet-gns-proxy",
                    "WARNING",
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c
index ecf4d59f5..42f3e1514 100644
--- a/src/gns/gnunet-service-gns_interceptor.c
+++ b/src/gns/gnunet-service-gns_interceptor.c
@@ -103,7 +103,7 @@ reply_to_dns (void *cls, uint32_t rd_count,
  unsigned int num_answers;
  unsigned int skip_answers;
  unsigned int skip_additional;
-  size_t off;
+  size_t off = 0;
  /* Put records in the DNS packet */
  num_answers = 0;
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 54c3cba23..67960ef97 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -2397,6 +2397,8 @@ handle_dht_response (void *cls,
                "Received expired block from the DHT, will not cache it.\n");
    return;
  }
+  if (GNUNET_YES == disable_cache)
+    return;
  /* Cache well-formed blocks */
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Caching response from the DHT in namecache\n");
@@ -2407,7 +2409,7 @@ handle_dht_response (void *cls,
                                                         co);
  GNUNET_CONTAINER_DLL_insert (co_head,
                               co_tail,
-                               co);
+                               co);  
 }
diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf
index a7b842302..0d9d2b49a 100644
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@ -4,14 +4,14 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-peer-1/
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [transport]
 PLUGINS =
 [gns]
 # PREFIX = valgrind --leak-check=full --track-origins=yes
-AUTOSTART = YES
+START_ON_DEMAND = YES
 AUTO_IMPORT_PKEY = YES
 MAX_PARALLEL_BACKGROUND_QUERIES = 10
 DEFAULT_LOOKUP_TIMEOUT = 15 s
diff --git a/src/gns/test_gns_nick_shorten.conf b/src/gns/test_gns_nick_shorten.conf
index 210159fc8..317477c80 100644
--- a/src/gns/test_gns_nick_shorten.conf
+++ b/src/gns/test_gns_nick_shorten.conf
@@ -4,14 +4,14 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-peer-1/
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [transport]
 PLUGINS =
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
-AUTOSTART = YES
+START_ON_DEMAND = YES
 AUTO_IMPORT_PKEY = YES
 MAX_PARALLEL_BACKGROUND_QUERIES = 10
 DEFAULT_LOOKUP_TIMEOUT = 15 s
diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf
index 875c0a5e3..51edd5a0c 100644
--- a/src/gns/test_gns_proxy.conf
+++ b/src/gns/test_gns_proxy.conf
@@ -13,7 +13,7 @@ WEAKRANDOM = YES
 HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 [gns]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 ZONEKEY = $GNUNET_TEST_HOME/.zonekey
 HIJACK_DNS = YES
@@ -22,7 +22,7 @@ PROXY_CACERT = proxy/test_cert.pem
 PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
 [namestore]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [dns]
 PROVIDE_EXIT = NO
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf
index 5bf6f8e63..374731377 100644
--- a/src/gns/test_gns_simple_lookup.conf
+++ b/src/gns/test_gns_simple_lookup.conf
@@ -1,13 +1,13 @@
 @INLINE@ test_gns_defaults.conf
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [resolver]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 HOSTNAME = localhost
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
@@ -54,12 +54,12 @@ EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 [dns]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 DNS_EXIT = 8.8.8.8
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
-AUTOSTART = YES
+START_ON_DEMAND = YES
 BINARY = gnunet-service-gns
 ZONEKEY = zonefiles/test_zonekey
 PRIVATE_ZONE = private
@@ -75,14 +75,14 @@ DEFAULT_LOOKUP_TIMEOUT = 15 s
 RECORD_PUT_INTERVAL = 1 h
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [statistics]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [namestore]
 PORT = 22371
-AUTOSTART = YES
+START_ON_DEMAND = YES
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namestore-default.sock
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
diff --git a/src/gnsrecord/gnsrecord_serialization.c b/src/gnsrecord/gnsrecord_serialization.c
index adbf02755..a1cfbe984 100644
--- a/src/gnsrecord/gnsrecord_serialization.c
+++ b/src/gnsrecord/gnsrecord_serialization.c
@@ -120,6 +120,21 @@ GNUNET_GNSRECORD_records_get_size (unsigned int rd_count,
    GNUNET_break (0);
    return -1;
  }
+  //Do not pad PKEY
+  if (GNUNET_GNSRECORD_TYPE_PKEY == rd->record_type)
+    return ret;
+  /**
+   * Efficiently round up to the next
+   * power of 2 for padding
+   * https://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
+   */
+  ret--;
+  ret |= ret >> 1;
+  ret |= ret >> 2;
+  ret |= ret >> 4;
+  ret |= ret >> 8;
+  ret |= ret >> 16;
+  ret++;
  return (ssize_t) ret;
 }
@@ -135,9 +150,9 @@ GNUNET_GNSRECORD_records_get_size (unsigned int rd_count,
 */
 ssize_t
 GNUNET_GNSRECORD_records_serialize (unsigned int rd_count,
-                                    const struct GNUNET_GNSRECORD_Data *rd,
+                                    const struct GNUNET_GNSRECORD_Data *rd,
-                                    size_t dest_size,
+                                    size_t dest_size,
-                                    char *dest)
+                                    char *dest)
 {
  struct NetworkRecord rec;
  size_t off;
@@ -190,7 +205,7 @@ GNUNET_GNSRECORD_records_serialize (unsigned int rd_count,
    }
 #endif
  }
-  return off;
+  return dest_size;
 }
@@ -205,9 +220,9 @@ GNUNET_GNSRECORD_records_serialize (unsigned int rd_count,
 */
 int
 GNUNET_GNSRECORD_records_deserialize (size_t len,
-                                      const char *src,
+                                      const char *src,
-                                      unsigned int rd_count,
+                                      unsigned int rd_count,
-                                      struct GNUNET_GNSRECORD_Data *dest)
+                                      struct GNUNET_GNSRECORD_Data *dest)
 {
  struct NetworkRecord rec;
  size_t off;
diff --git a/src/hostlist/hostlist.conf b/src/hostlist/hostlist.conf
index 77cd29e73..59cc351cc 100644
--- a/src/hostlist/hostlist.conf
+++ b/src/hostlist/hostlist.conf
@@ -1,5 +1,5 @@
 [hostlist]
-FORCESTART = YES
+IMMEDIATE_START = YES
 NOARMBIND = YES
 BINARY = gnunet-daemon-hostlist
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index f3346b9fc..00c57c1e5 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -34,11 +34,11 @@ HTTPPORT = 12980
 HOSTLISTFILE = hostlists_peer1.file
 OPTIONS = -b -p
 SERVERS = http://localhost:22981/
-FORCESTART = YES
+IMMEDIATE_START = YES
 [ats]
 PORT = 12971
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
 [topology]
-FORCESTART = YES
-\ No newline at end of file
+IMMEDIATE_START = YES
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index 95fb7ea1b..6bcd63fe7 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -34,11 +34,11 @@ HTTPPORT = 22981
 HOSTLISTFILE = hostlists_peer2.file
 OPTIONS = -b -p
 SERVERS = http://localhost:12980/
-FORCESTART = YES
+IMMEDIATE_START = YES
 [ats]
 PORT = 22971
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock
 [topology]
-FORCESTART = YES
+IMMEDIATE_START = YES
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index 11c846634..3bee3c0c7 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -35,11 +35,11 @@ HOSTLISTFILE = hostlists_adv_peer.file
 OPTIONS = -p -a
 SERVERS = http://localhost:12981/
 EXTERNAL_DNS_NAME = localhost
-FORCESTART = YES
+IMMEDIATE_START = YES
 [ats]
 PORT = 22971
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-ats-p2-service-core.sock
 [topology]
-FORCESTART = YES
+IMMEDIATE_START = YES
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index 76585dbbd..0dafe6302 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -34,11 +34,11 @@ HTTPPORT = 12980
 HOSTLISTFILE = hostlists_learn_peer.file
 OPTIONS = -b -e
 SERVERS = http://localhost:12981/
-FORCESTART = YES
+IMMEDIATE_START = YES
 [ats]
 PORT = 12971
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-ats-p1-service-core.sock
 [topology]
-FORCESTART = YES
+IMMEDIATE_START = YES
diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf
index 593744cdc..dc2956dcc 100644
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/hostlist/test_learning_learn_peer2.conf
@@ -34,7 +34,7 @@ HTTPPORT = 32980
 HOSTLISTFILE = hostlists_learn_peer2.file
 OPTIONS = -b -e
 SERVERS = http://localhost:12981/
-FORCESTART = YES
+IMMEDIATE_START = YES
 [topology]
-FORCESTART = YES
+IMMEDIATE_START = YES
diff --git a/src/identity-provider/identity-provider.conf b/src/identity-provider/identity-provider.conf
index f2c24c32d..cc50152a1 100644
--- a/src/identity-provider/identity-provider.conf
+++ b/src/identity-provider/identity-provider.conf
@@ -1,6 +1,6 @@
 [identity-provider]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-USER_SERVICE = YES
+RUN_PER_USER = YES
 #PORT = 2108
 HOSTNAME = localhost
 BINARY = gnunet-service-identity-provider
diff --git a/src/identity-provider/test_idp.conf b/src/identity-provider/test_idp.conf
index 3559dd767..3e4df561a 100644
--- a/src/identity-provider/test_idp.conf
+++ b/src/identity-provider/test_idp.conf
@@ -4,22 +4,22 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-idp-peer-1/
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [rest]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/restlog
 [transport]
 PLUGINS =
 [identity-provider]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 #PREFIX = valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --log-file=$GNUNET_TMP/idplog
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
-AUTOSTART = YES
+START_ON_DEMAND = YES
 AUTO_IMPORT_PKEY = YES
 MAX_PARALLEL_BACKGROUND_QUERIES = 10
 DEFAULT_LOOKUP_TIMEOUT = 15 s
diff --git a/src/identity/identity.conf.in b/src/identity/identity.conf.in
index 4af3a6261..f5d454323 100644
--- a/src/identity/identity.conf.in
+++ b/src/identity/identity.conf.in
@@ -1,6 +1,6 @@
 [identity]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
-USER_SERVICE = YES
+RUN_PER_USER = YES
 @JAVAPORT@PORT = 2108
 HOSTNAME = localhost
 BINARY = gnunet-service-identity
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index d30b85bfc..b4bf5b0aa 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -24,6 +24,7 @@
 *
 * @author Christian Grothoff
 * @author Nils Durner
+ * @author Martin Schanzenbach
 *
 * @defgroup logging Logging
 * @see [Documentation](https://gnunet.org/logging)
@@ -112,6 +113,11 @@ extern "C"
 #endif
 /**
+ * wrap va_arg for enums
+ */
+#define GNUNET_VA_ARG_ENUM(va,X) ((enum X) va_arg (va, int))
+/**
 * @ingroup logging
 * define #GNUNET_EXTRA_LOGGING if using this header outside the GNUnet source
 * tree where gnunet_config.h is unavailable
@@ -761,14 +767,14 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
 * @ingroup logging
 * Use this for fatal errors that cannot be handled
 */
-#define GNUNET_assert(cond) do { if (! (cond)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Assertion failed at %s:%d.\n"), __FILE__, __LINE__); GNUNET_abort_(); } } while(0)
+#define GNUNET_assert(cond) do { if (! (cond)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Assertion failed at %s:%d. Aborting.\n"), __FILE__, __LINE__); GNUNET_abort_(); } } while(0)
 /**
 * @ingroup logging
 * Use this for fatal errors that cannot be handled
 */
-#define GNUNET_assert_at(cond, f, l) do { if (! (cond)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Assertion failed at %s:%d.\n"), f, l); GNUNET_abort_(); } } while(0)
+#define GNUNET_assert_at(cond, f, l) do { if (! (cond)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Assertion failed at %s:%d. Aborting.\n"), f, l); GNUNET_abort_(); } } while(0)
 /**
@@ -778,7 +784,7 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
 * @param cond Condition to evaluate
 * @param comp Component string to use for logging
 */
-#define GNUNET_assert_from(cond, comp) do { if (! (cond)) { GNUNET_log_from(GNUNET_ERROR_TYPE_ERROR, comp, _("Assertion failed at %s:%d.\n"), __FILE__, __LINE__); GNUNET_abort_(); } } while(0)
+#define GNUNET_assert_from(cond, comp) do { if (! (cond)) { GNUNET_log_from(GNUNET_ERROR_TYPE_ERROR, comp, _("Assertion failed at %s:%d. Aborting.\n"), __FILE__, __LINE__); GNUNET_abort_(); } } while(0)
 /**
diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index 13f920937..b6fac6111 100644
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -150,8 +150,9 @@ GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
 * Cancel pending lookup request
 *
 * @param lr the lookup request to cancel
+ * @return closure from the lookup result processor
 */
-void
+void *
 GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr);
@@ -198,8 +199,9 @@ GNUNET_GNS_lookup_with_tld (struct GNUNET_GNS_Handle *handle,
 * Cancel pending lookup request
 *
 * @param ltr the lookup request to cancel
+ * @return closure from the lookup result processor
 */
-void
+void *
 GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr);
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h
index b3f1eb632..20846238b 100644
--- a/src/include/gnunet_gnsrecord_lib.h
+++ b/src/include/gnunet_gnsrecord_lib.h
@@ -499,10 +499,10 @@ GNUNET_GNSRECORD_pkey_to_zkey (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey);
 /**
- * Convert an absolute domain name in the ".zkey" pTLD to the
+ * Convert an absolute domain name to the
 * respective public key.
 *
- * @param zkey string "X.zkey" where X is the public
+ * @param zkey string "X" where X is the public
 *         key in an encoding suitable for DNS labels.
 * @param pkey set to a public key on the eliptic curve
 * @return #GNUNET_SYSERR if @a zkey has the wrong syntax
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index 26e816267..38a7d7fbc 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -32,13 +32,13 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
 PORT = 20022
 [namestore]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [dns]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19
 [consensus]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [core]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf
index 0cd6fc4f9..6c8f07632 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -33,16 +33,16 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
 PORT = 20022
 [namestore]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [dns]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19
 [consensus]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [lockmanager]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [core]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17
diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf
index 39020515f..3ccdc2946 100644
--- a/src/integration-tests/confs/test_defaults.conf
+++ b/src/integration-tests/confs/test_defaults.conf
@@ -2,25 +2,25 @@
 @INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf
 [fs]
-FORCESTART = YES
+IMMEDIATE_START = YES
 [datastore]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [cadet]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [hostlist]
-FORCESTART = YES
+IMMEDIATE_START = YES
 [topology]
-FORCESTART = YES
+IMMEDIATE_START = YES
 [peerinfo]
 USE_INCLUDED_HELLOS = NO
diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c
index cf7dde913..21eb39daa 100644
--- a/src/multicast/gnunet-service-multicast.c
+++ b/src/multicast/gnunet-service-multicast.c
@@ -1448,6 +1448,12 @@ check_client_member_join (void *cls,
  uint16_t msg_size = ntohs (msg->header.size);
  struct GNUNET_PeerIdentity *relays = (struct GNUNET_PeerIdentity *) &msg[1];
  uint32_t relay_count = ntohl (msg->relay_count);
+  if (0 == relay_count}
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
  if (UINT32_MAX / relay_count < sizeof (*relays)){
      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                    "relay_count (%lu) * sizeof (*relays)  (%lu) exceeds UINT32_MAX!\n",
diff --git a/src/multicast/multicast.conf.in b/src/multicast/multicast.conf.in
index f4a6daa1e..97a541336 100644
--- a/src/multicast/multicast.conf.in
+++ b/src/multicast/multicast.conf.in
@@ -1,5 +1,5 @@
 [multicast]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 BINARY = gnunet-service-multicast
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock
diff --git a/src/multicast/test_multicast.conf b/src/multicast/test_multicast.conf
index 1b50e0893..b2f1a764b 100644
--- a/src/multicast/test_multicast.conf
+++ b/src/multicast/test_multicast.conf
@@ -10,7 +10,7 @@ GLOBAL_POSTFIX=-L ERROR
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [peerinfo]
 # Do not use shipped gnunet HELLOs 
@@ -21,36 +21,36 @@ USE_INCLUDED_HELLOS = NO
 NO_IO = YES
 [hostlist]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [nat]
 ENABLE_UPNP = NO
 [fs]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [vpn]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [revocation]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [gns]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [namestore]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [namecache]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [topology]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
diff --git a/src/multicast/test_multicast_line.conf b/src/multicast/test_multicast_line.conf
index 1047205cb..c1ce7c63f 100644
--- a/src/multicast/test_multicast_line.conf
+++ b/src/multicast/test_multicast_line.conf
@@ -11,7 +11,7 @@ GLOBAL_POSTFIX=-L ERROR
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [peerinfo]
 # Do not use shipped gnunet HELLOs 
@@ -25,39 +25,39 @@ NO_IO = YES
 ID_ANNOUNCE_TIME = 5 s
 [hostlist]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [nat]
 ENABLE_UPNP = NO
 [fs]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [vpn]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [revocation]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [gns]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [namestore]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [namecache]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [topology]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [nse]
 WORKBITS = 0
diff --git a/src/multicast/test_multicast_star.conf b/src/multicast/test_multicast_star.conf
index ed690d95d..516c0e302 100644
--- a/src/multicast/test_multicast_star.conf
+++ b/src/multicast/test_multicast_star.conf
@@ -11,7 +11,7 @@ GLOBAL_POSTFIX=-L ERROR
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [peerinfo]
 # Do not use shipped gnunet HELLOs 
@@ -25,39 +25,39 @@ NO_IO = YES
 ID_ANNOUNCE_TIME = 5 s
 [hostlist]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [nat]
 ENABLE_UPNP = NO
 [fs]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [vpn]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [revocation]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [gns]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [namestore]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [namecache]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [topology]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [nse]
 WORKBITS = 0
diff --git a/src/namecache/gnunet-service-namecache.c b/src/namecache/gnunet-service-namecache.c
index cda1267e8..c852aaacc 100644
--- a/src/namecache/gnunet-service-namecache.c
+++ b/src/namecache/gnunet-service-namecache.c
@@ -148,7 +148,11 @@ struct LookupBlockContext
   * Operation id for the name lookup
   */
  uint32_t request_id;
+  
+  /**
+   * Lookup status
+   */
+  int status;
 };
@@ -166,7 +170,17 @@ handle_lookup_block_it (void *cls,
  struct GNUNET_MQ_Envelope *env;
  struct LookupBlockResponseMessage *r;
  size_t esize;
+  size_t bsize;
+  bsize = ntohl (block->purpose.size);
+  if (bsize < 
+      (sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) + sizeof (struct GNUNET_TIME_AbsoluteNBO)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Malformed block.");
+    lnc->status = GNUNET_SYSERR;
+    return;
+  }
  esize = ntohl (block->purpose.size)
    - sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose)
    - sizeof (struct GNUNET_TIME_AbsoluteNBO);
@@ -209,6 +223,7 @@ handle_lookup_block (void *cls,
  lnc.request_id = ntohl (ln_msg->gns_header.r_id);
  lnc.nc = nc;
+  lnc.status = GNUNET_OK;
  if (GNUNET_SYSERR ==
      (ret = GSN_database->lookup_block (GSN_database->cls,
                                         &ln_msg->query,
@@ -222,7 +237,7 @@ handle_lookup_block (void *cls,
    GNUNET_SERVICE_client_drop (nc->client);
    return;
  }
-  if (0 == ret)
+  if ((0 == ret) || (GNUNET_SYSERR == lnc.status))
  {
    /* no records match at all, generate empty response */
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/namecache/namecache.conf.in b/src/namecache/namecache.conf.in
index becd34187..cf1340846 100644
--- a/src/namecache/namecache.conf.in
+++ b/src/namecache/namecache.conf.in
@@ -1,6 +1,6 @@
 [namecache]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
-USER_SERVICE = NO
+RUN_PER_USER = NO
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namecache.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c
index 2bb233da1..2a60a2813 100644
--- a/src/namecache/namecache_api.c
+++ b/src/namecache/namecache_api.c
@@ -483,9 +483,11 @@ GNUNET_NAMECACHE_block_cache (struct GNUNET_NAMECACHE_Handle *h,
  if (NULL == h->mq)
    return NULL;
-  blen = ntohl (block->purpose.size)
+  blen = ntohl (block->purpose.size);
-    - sizeof (struct GNUNET_TIME_AbsoluteNBO)
+  GNUNET_assert (blen > (sizeof (struct GNUNET_TIME_AbsoluteNBO) + 
-    - sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose);
+                         sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose)));
+  blen -= (sizeof (struct GNUNET_TIME_AbsoluteNBO) +
+           sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose));
  rid = get_op_id (h);
  qe = GNUNET_new (struct GNUNET_NAMECACHE_QueueEntry);
  qe->nsh = h;
diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c
index f4cdf26b4..0853ff4d7 100644
--- a/src/namestore/gnunet-namestore-fcfsd.c
+++ b/src/namestore/gnunet-namestore-fcfsd.c
@@ -117,7 +117,11 @@ struct Request
   * a POST request).
   */
  struct MHD_PostProcessor *pp;
+   
+  /**
+   * MHD Connection
+   */
+  struct MHD_Connection *con;
  /**
   * URL to serve in response to this POST (if this request
   * was a 'POST')
@@ -130,6 +134,11 @@ struct Request
  struct GNUNET_NAMESTORE_QueueEntry *qe;
  /**
+   * Active lookup iterator
+   * TODO: deprecate or fix lookup by label and use above member
+   */
+  struct GNUNET_NAMESTORE_ZoneIterator *lookup_it;
+  /**
   * Active iteration with the namestore.
   */
  struct GNUNET_NAMESTORE_ZoneIterator *zi;
@@ -569,6 +578,7 @@ put_continuation (void *cls,
  }
  else
    request->phase = RP_SUCCESS;
+  MHD_resume_connection (request->con);
  run_httpd_now ();
 }
@@ -584,6 +594,7 @@ zone_to_name_error (void *cls)
  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
              _("Error when mapping zone to name\n"));
  request->phase = RP_FAIL;
+  MHD_resume_connection (request->con);
  run_httpd_now ();
 }
@@ -616,6 +627,7 @@ zone_to_name_cb (void *cls,
                _("Found existing name `%s' for the given key\n"),
                name);
    request->phase = RP_FAIL;
+    MHD_resume_connection (request->con);
    run_httpd_now ();
    return;
  }
@@ -637,10 +649,10 @@ zone_to_name_cb (void *cls,
 * We encountered an error in the name lookup.
 */
 static void
-lookup_block_error (void *cls)
+lookup_it_error (void *cls)
 {
  struct Request *request = cls;
+  MHD_resume_connection (request->con);
  request->qe = NULL;
  request->phase = RP_FAIL;
  run_httpd_now ();
@@ -658,7 +670,7 @@ lookup_block_error (void *cls)
 * @param rd array of records with data to store
 */
 static void
-lookup_block_processor (void *cls,
+lookup_it_processor (void *cls,
                        const struct GNUNET_CRYPTO_EcdsaPrivateKey *zonekey,
                        const char *label,
                        unsigned int rd_count,
@@ -669,39 +681,48 @@ lookup_block_processor (void *cls,
  (void) label;
  (void) rd;
  (void) zonekey;
-  request->qe = NULL;
+  if (0 == strcmp (label, request->domain_name)) {
-  if (0 == rd_count)
+    GNUNET_break (0 != rd_count);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                _("Found %u existing records for domain `%s'\n"),
+                rd_count,
+                request->domain_name);
+    request->phase = RP_FAIL;
+  }
+  GNUNET_NAMESTORE_zone_iterator_next (request->lookup_it, 1);
+}
+static void
+lookup_it_finished (void *cls)
+{
+  struct Request *request = cls;
+  
+  if (RP_FAIL == request->phase)
  {
-    if (GNUNET_OK !=
+    MHD_resume_connection (request->con);
-        GNUNET_CRYPTO_ecdsa_public_key_from_string (request->public_key,
+    run_httpd_now ();
-                                                    strlen (request->public_key),
-                                                    &request->pub))
-    {
-      GNUNET_break (0);
-      request->phase = RP_FAIL;
-      run_httpd_now ();
-      return;
-    }
-    request->qe = GNUNET_NAMESTORE_zone_to_name (ns,
-                                                 &fcfs_zone_pkey,
-                                                 &request->pub,
-                                                 &zone_to_name_error,
-                                                 request,
-                                                 &zone_to_name_cb,
-                                                 request);
    return;
  }
-  GNUNET_break (0 != rd_count);
+  if (GNUNET_OK !=
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+      GNUNET_CRYPTO_ecdsa_public_key_from_string (request->public_key,
-              _("Found %u existing records for domain `%s'\n"),
+                                                  strlen (request->public_key),
-              rd_count,
+                                                  &request->pub))
-              request->domain_name);
+  {
-  request->phase = RP_FAIL;
+    GNUNET_break (0);
-  run_httpd_now ();
+    request->phase = RP_FAIL;
-  return;
+    MHD_resume_connection (request->con);
+    run_httpd_now ();
+    return;
+  }
+  request->qe = GNUNET_NAMESTORE_zone_to_name (ns,
+                                               &fcfs_zone_pkey,
+                                               &request->pub,
+                                               &zone_to_name_error,
+                                               request,
+                                               &zone_to_name_cb,
+                                               request);
 }
 /**
 * Main MHD callback for handling requests.
 *
@@ -727,13 +748,13 @@ lookup_block_processor (void *cls,
 */
 static int
 create_response (void *cls,
-                 struct MHD_Connection *connection,
+                 struct MHD_Connection *connection,
-                 const char *url,
+                 const char *url,
-                 const char *method,
+                 const char *method,
-                 const char *version,
+                 const char *version,
-                 const char *upload_data,
+                 const char *upload_data,
-                 size_t *upload_data_size,
+                 size_t *upload_data_size,
-                 void **ptr)
+                 void **ptr)
 {
  struct MHD_Response *response;
  struct Request *request;
@@ -744,114 +765,117 @@ create_response (void *cls,
  (void) version;
  if ( (0 == strcmp (method, MHD_HTTP_METHOD_GET)) ||
       (0 == strcmp (method, MHD_HTTP_METHOD_HEAD)) )
-    {
+  {
-      if (0 == strcmp (url, FCFS_ZONEINFO_URL))
+    if (0 == strcmp (url, FCFS_ZONEINFO_URL))
-        ret = serve_zoneinfo_page (connection);
+      ret = serve_zoneinfo_page (connection);
-      else
+    else
-        ret = serve_main_page (connection);
+      ret = serve_main_page (connection);
-      if (ret != MHD_YES)
+    if (ret != MHD_YES)
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    _("Failed to create page for `%s'\n"),
+                  _("Failed to create page for `%s'\n"),
-                    url);
+                  url);
-      return ret;
+    return ret;
-    }
+  }
  if (0 == strcmp (method, MHD_HTTP_METHOD_POST))
+  {
+    request = *ptr;
+    if (NULL == request)
    {
-      request = *ptr;
+      request = GNUNET_new (struct Request);
-      if (NULL == request)
+      request->con = connection;
-      {
+      *ptr = request;
-        request = GNUNET_new (struct Request);
+      request->pp = MHD_create_post_processor (connection,
-        *ptr = request;
+                                               1024,
-        request->pp = MHD_create_post_processor (connection,
+                                               &post_iterator,
-                                                 1024,
+                                               request);
-                                                 &post_iterator,
+      if (NULL == request->pp)
-                                                 request);
-        if (NULL == request->pp)
-          {
-            GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                        _("Failed to setup post processor for `%s'\n"),
-                        url);
-            return MHD_NO; /* internal error */
-          }
-        return MHD_YES;
-      }
-      if (NULL != request->pp)
      {
-        /* evaluate POST data */
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-        MHD_post_process (request->pp,
+                    _("Failed to setup post processor for `%s'\n"),
-                          upload_data,
+                    url);
-                          *upload_data_size);
+        return MHD_NO; /* internal error */
-        if (0 != *upload_data_size)
-          {
-            *upload_data_size = 0;
-            return MHD_YES;
-          }
-        /* done with POST data, serve response */
-        MHD_destroy_post_processor (request->pp);
-        request->pp = NULL;
      }
-      if (GNUNET_OK !=
+      return MHD_YES;
-          GNUNET_CRYPTO_ecdsa_public_key_from_string (request->public_key,
+    }
-                                                      strlen (request->public_key),
+    if (NULL != request->pp)
-                                                      &pub))
+    {
+      /* evaluate POST data */
+      MHD_post_process (request->pp,
+                        upload_data,
+                        *upload_data_size);
+      if (0 != *upload_data_size)
      {
-        /* parse error */
+        *upload_data_size = 0;
-        return fill_s_reply ("Failed to parse given public key",
+        return MHD_YES;
-                             request, connection);
      }
-      switch (request->phase)
+      /* done with POST data, serve response */
-        {
+      MHD_destroy_post_processor (request->pp);
-        case RP_START:
+      request->pp = NULL;
-          if (NULL != strchr (request->domain_name, (int) '.'))
+    }
-          {
+    if (GNUNET_OK !=
-            GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+        GNUNET_CRYPTO_ecdsa_public_key_from_string (request->public_key,
-                        _("Domain name must not contain `.'\n"));
+                                                    strlen (request->public_key),
-            request->phase = RP_FAIL;
+                                                    &pub))
-            return fill_s_reply ("Domain name must not contain `.', sorry.",
+    {
-                                 request,
+      /* parse error */
-                                 connection);
+      return fill_s_reply ("Failed to parse given public key",
-          }
+                           request, connection);
-          if (NULL != strchr (request->domain_name, (int) '+'))
+    }
-          {
+    switch (request->phase)
-            GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+    {
-                        _("Domain name must not contain `+'\n"));
+      case RP_START:
-            request->phase = RP_FAIL;
+        if (NULL != strchr (request->domain_name, (int) '.'))
-            return fill_s_reply ("Domain name must not contain `+', sorry.",
+        {
-                                 request, connection);
+          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-          }
+                      _("Domain name must not contain `.'\n"));
-          request->phase = RP_LOOKUP;
+          request->phase = RP_FAIL;
-          request->qe
+          return fill_s_reply ("Domain name must not contain `.', sorry.",
-            = GNUNET_NAMESTORE_records_lookup (ns,
+                               request,
-                                               &fcfs_zone_pkey,
+                               connection);
-                                               request->domain_name,
+        }
-                                               &lookup_block_error,
+        if (NULL != strchr (request->domain_name, (int) '+'))
-                                               request,
+        {
-                                               &lookup_block_processor,
+          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                                               request);
+                      _("Domain name must not contain `+'\n"));
-          break;
+          request->phase = RP_FAIL;
-        case RP_LOOKUP:
+          return fill_s_reply ("Domain name must not contain `+', sorry.",
-          break;
+                               request, connection);
-        case RP_PUT:
+        }
-          break;
+        request->phase = RP_LOOKUP;
-        case RP_FAIL:
+        MHD_suspend_connection (request->con);
-          return fill_s_reply ("Request failed, sorry.",
+        request->lookup_it
-                               request, connection);
+          = GNUNET_NAMESTORE_zone_iteration_start (ns,
-        case RP_SUCCESS:
+                                                   &fcfs_zone_pkey,
-          return fill_s_reply ("Success.",
+                                                   &lookup_it_error,
-                               request, connection);
+                                                   request,
-        default:
+                                                   &lookup_it_processor,
-          GNUNET_break (0);
+                                                   request,
-          return MHD_NO;
+                                                   &lookup_it_finished,
-        }
+                                                   request);
-        return MHD_YES; /* will have a reply later... */
+        break;
+      case RP_LOOKUP:
+        break;
+      case RP_PUT:
+        break;
+      case RP_FAIL:
+        return fill_s_reply ("Request failed, sorry.",
+                             request, connection);
+      case RP_SUCCESS:
+        return fill_s_reply ("Success.",
+                             request, connection);
+      default:
+        GNUNET_break (0);
+        return MHD_NO;
    }
+    return MHD_YES; /* will have a reply later... */
+  }
  /* unsupported HTTP method */
  response = MHD_create_response_from_buffer (strlen (METHOD_ERROR),
-                                              (void *) METHOD_ERROR,
+                                              (void *) METHOD_ERROR,
-                                              MHD_RESPMEM_PERSISTENT);
+                                              MHD_RESPMEM_PERSISTENT);
  ret = MHD_queue_response (connection,
-                            MHD_HTTP_NOT_ACCEPTABLE,
+                            MHD_HTTP_NOT_ACCEPTABLE,
-                            response);
+                            response);
  MHD_destroy_response (response);
  return ret;
 }
@@ -868,9 +892,9 @@ create_response (void *cls,
 */
 static void
 request_completed_callback (void *cls,
-                            struct MHD_Connection *connection,
+                            struct MHD_Connection *connection,
-                            void **con_cls,
+                            void **con_cls,
-                            enum MHD_RequestTerminationCode toe)
+                            enum MHD_RequestTerminationCode toe)
 {
  struct Request *request = *con_cls;
@@ -915,33 +939,33 @@ run_httpd ()
  wws = GNUNET_NETWORK_fdset_create ();
  max = -1;
  GNUNET_assert (MHD_YES ==
-                 MHD_get_fdset (httpd,
+                 MHD_get_fdset (httpd,
-                                &rs,
+                                &rs,
-                                &ws,
+                                &ws,
-                                &es,
+                                &es,
-                                &max));
+                                &max));
  haveto = MHD_get_timeout (httpd,
-                            &timeout);
+                            &timeout);
  if (haveto == MHD_YES)
    tv.rel_value_us = (uint64_t) timeout * 1000LL;
  else
    tv = GNUNET_TIME_UNIT_FOREVER_REL;
  GNUNET_NETWORK_fdset_copy_native (wrs,
-                                    &rs,
+                                    &rs,
-                                    max + 1);
+                                    max + 1);
  GNUNET_NETWORK_fdset_copy_native (wws,
-                                    &ws,
+                                    &ws,
-                                    max + 1);
+                                    max + 1);
  GNUNET_NETWORK_fdset_copy_native (wes,
-                                    &es,
+                                    &es,
-                                    max + 1);
+                                    max + 1);
  httpd_task =
-      GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_HIGH,
+    GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_HIGH,
-                                   tv,
+                                 tv,
-                                   wrs,
+                                 wrs,
-                                   wws,
+                                 wws,
-                                   &do_httpd,
+                                 &do_httpd,
-                                   NULL);
+                                 NULL);
  GNUNET_NETWORK_fdset_destroy (wrs);
  GNUNET_NETWORK_fdset_destroy (wws);
  GNUNET_NETWORK_fdset_destroy (wes);
@@ -1026,9 +1050,9 @@ do_shutdown (void *cls)
 */
 static void
 identity_cb (void *cls,
-             struct GNUNET_IDENTITY_Ego *ego,
+             struct GNUNET_IDENTITY_Ego *ego,
-             void **ctx,
+             void **ctx,
-             const char *name)
+             const char *name)
 {
  int options;
@@ -1037,40 +1061,40 @@ identity_cb (void *cls,
  if (NULL == name)
    return;
  if (0 != strcmp (name,
-                   zone))
+                   zone))
    return;
  if (NULL == ego)
  {
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("No ego configured for `fcfsd` subsystem\n"));
+                _("No ego configured for `fcfsd` subsystem\n"));
    GNUNET_SCHEDULER_shutdown ();
    return;
  }
  fcfs_zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (ego);
-  options = MHD_USE_DUAL_STACK | MHD_USE_DEBUG;
+  options = MHD_USE_DUAL_STACK | MHD_USE_DEBUG | MHD_ALLOW_SUSPEND_RESUME;
  do
-    {
+  {
-      httpd = MHD_start_daemon (options,
+    httpd = MHD_start_daemon (options,
-                                (uint16_t) port,
+                              (uint16_t) port,
-                                NULL, NULL,
+                              NULL, NULL,
-                                &create_response, NULL,
+                              &create_response, NULL,
-                                MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 128,
+                              MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 128,
-                                MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 1,
+                              MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 1,
-                                MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 16,
+                              MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 16,
-                                MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (4 * 1024),
+                              MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (4 * 1024),
-                                MHD_OPTION_NOTIFY_COMPLETED, &request_completed_callback, NULL,
+                              MHD_OPTION_NOTIFY_COMPLETED, &request_completed_callback, NULL,
-                                MHD_OPTION_END);
+                              MHD_OPTION_END);
-      if (MHD_USE_DEBUG == options)
+    if (MHD_USE_DEBUG == options)
-        break;
+      break;
-      options = MHD_USE_DEBUG;
+    options = MHD_USE_DEBUG;
-    }
+  }
  while (NULL == httpd);
  if (NULL == httpd)
  {
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Failed to start HTTP server\n"));
+                _("Failed to start HTTP server\n"));
    GNUNET_SCHEDULER_shutdown ();
    return;
  }
@@ -1097,24 +1121,24 @@ run (void *cls,
  (void) cfgfile;
  if (GNUNET_OK !=
      GNUNET_CONFIGURATION_get_value_number (cfg,
-                                             "fcfsd",
+                                             "fcfsd",
-                                             "HTTPPORT",
+                                             "HTTPPORT",
-                                             &port))
+                                             &port))
  {
    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "fcfsd", "HTTPPORT");
+                               "fcfsd", "HTTPPORT");
    return;
  }
  ns = GNUNET_NAMESTORE_connect (cfg);
  if (NULL == ns)
-    {
+  {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("Failed to connect to namestore\n"));
+                _("Failed to connect to namestore\n"));
-      return;
+    return;
-    }
+  }
  identity = GNUNET_IDENTITY_connect (cfg,
-                                      &identity_cb,
+                                      &identity_cb,
-                                      NULL);
+                                      NULL);
  if (NULL == identity)
  {
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -1122,9 +1146,9 @@ run (void *cls,
    return;
  }
  uzp_task = GNUNET_SCHEDULER_add_now (&update_zoneinfo_page,
-                                       NULL);
+                                       NULL);
  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
-                                 NULL);
+                                 NULL);
 }
@@ -1141,31 +1165,31 @@ main (int argc,
 {
  struct GNUNET_GETOPT_CommandLineOption options[] = {
    GNUNET_GETOPT_option_mandatory 
-    (GNUNET_GETOPT_option_string ('z',
+      (GNUNET_GETOPT_option_string ('z',
-                                  "zone",
+                                    "zone",
-                                  "EGO",
+                                    "EGO",
-                                  gettext_noop ("name of the zone that is to be managed by FCFSD"),
+                                    gettext_noop ("name of the zone that is to be managed by FCFSD"),
-                                  &zone)),
+                                    &zone)),
    GNUNET_GETOPT_OPTION_END
  };
  int ret;
  if (GNUNET_OK !=
      GNUNET_STRINGS_get_utf8_args (argc, argv,
-                                    &argc, &argv))
+                                    &argc, &argv))
    return 2;
  GNUNET_log_setup ("fcfsd",
-                    "WARNING",
+                    "WARNING",
-                    NULL);
+                    NULL);
  ret =
-      (GNUNET_OK ==
+    (GNUNET_OK ==
-       GNUNET_PROGRAM_run (argc,
+     GNUNET_PROGRAM_run (argc,
-                           argv,
+                         argv,
-                           "gnunet-namestore-fcfsd",
+                         "gnunet-namestore-fcfsd",
-                           _("GNU Name System First Come First Serve name registration service"),
+                         _("GNU Name System First Come First Serve name registration service"),
-                           options,
+                         options,
-                           &run, NULL)) ? 0 : 1;
+                         &run, NULL)) ? 0 : 1;
  GNUNET_free ((void*) argv);
  GNUNET_CRYPTO_ecdsa_key_clear (&fcfs_zone_pkey);
  return ret;
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index 6ffd99773..c5f48848e 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -752,12 +752,13 @@ handle_reverse_lookup (void *cls,
  reverse_qe = NULL;
  if (NULL == label)
    FPRINTF (stdout,
-             "%s.zkey\n",
+             "%s\n",
             reverse_pkey);
  else
    FPRINTF (stdout,
-             "%s.gnu\n",
+             "%s.%s\n",
-             label);
+             label,
+             ego_name);
  test_finished ();
 }
diff --git a/src/namestore/namestore.conf.in b/src/namestore/namestore.conf.in
index 8b5e440b8..eb95f95be 100644
--- a/src/namestore/namestore.conf.in
+++ b/src/namestore/namestore.conf.in
@@ -1,6 +1,6 @@
 [namestore]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
-USER_SERVICE = YES
+RUN_PER_USER = YES
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-namestore.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
@@ -42,7 +42,7 @@ gns = gnunet-namestore
 [fcfsd]
 # Name of the fcfs registration service binary (for ARM)
 BINARY = gnunet-namestore-fcfsd
-AUTOSTART = NO
+START_ON_DEMAND = NO
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-fcfsd.sock
 # On what port does the FCFS daemon listen for HTTP clients?
diff --git a/src/namestore/test_namestore_api.conf b/src/namestore/test_namestore_api.conf
index 5e96eab7c..3e75c2ded 100644
--- a/src/namestore/test_namestore_api.conf
+++ b/src/namestore/test_namestore_api.conf
@@ -6,14 +6,14 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-namestore/
 [namestore]
 DATABASE = sqlite
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [namecache]
 DATABASE = sqlite
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [identity]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [nse]
 WORKBITS = 0
diff --git a/src/nat-auto/nat-auto.conf.in b/src/nat-auto/nat-auto.conf.in
index 9461ffcc8..d5f5c4eef 100644
--- a/src/nat-auto/nat-auto.conf.in
+++ b/src/nat-auto/nat-auto.conf.in
@@ -1,5 +1,5 @@
 [nat-auto]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @UNIXONLY@ PORT = 2124
 HOSTNAME = localhost
 BINARY = gnunet-service-nat-auto
diff --git a/src/nat/nat.conf.in b/src/nat/nat.conf.in
index 87fe29d9c..a8dbee953 100644
--- a/src/nat/nat.conf.in
+++ b/src/nat/nat.conf.in
@@ -1,5 +1,5 @@
 [nat]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @UNIXONLY@ PORT = 2121
 HOSTNAME = localhost
 BINARY = gnunet-service-nat
diff --git a/src/nat/test_nat_test_data.conf b/src/nat/test_nat_test_data.conf
index c0174bf53..84de6159e 100644
--- a/src/nat/test_nat_test_data.conf
+++ b/src/nat/test_nat_test_data.conf
@@ -42,6 +42,6 @@ DISABLEV6 = YES
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in
index e8d7bd2ea..f3bd90e42 100644
--- a/src/nse/nse.conf.in
+++ b/src/nse/nse.conf.in
@@ -1,6 +1,6 @@
 [nse]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
-FORCESTART = YES
+IMMEDIATE_START = YES
 @JAVAPORT@PORT = 2097
 HOSTNAME = localhost
 BINARY = gnunet-service-nse
diff --git a/src/nse/nse_infiniband.conf b/src/nse/nse_infiniband.conf
index 9904ca711..d2c97567d 100644
--- a/src/nse/nse_infiniband.conf
+++ b/src/nse/nse_infiniband.conf
@@ -2,7 +2,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/nse-profiler/
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 ORT = 12113
 ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; 192.168.0.0/16;
 HOSTNAME = localhost
@@ -14,7 +14,7 @@ SETUP_TIMEOUT = 30m
 STATS_DIR= /home/totakura/nse/test/load
 [nse]
-FORCESTART = YES
+IMMEDIATE_START = YES
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
 WORKDELAY = 60 s
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index ad5da536b..f702faae2 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -2,7 +2,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/nse-profiler/
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16;
 HOSTNAME = localhost
@@ -12,8 +12,8 @@ OVERLAY_RANDOM_LINKS = 1000
 OPERATION_TIMEOUT = 45 s
 [nse]
-FORCESTART = YES
+IMMEDIATE_START = YES
-AUTOSTART = NO
+START_ON_DEMAND = NO
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
 WORKDELAY = 60 s
diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index 8331c241c..22866acfa 100644
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -3,7 +3,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-nse-multipeer/
 [nse]
 #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
-FORCESTART = YES
+IMMEDIATE_START = YES
 PROOFFILE = $GNUNET_TEST_HOME/proof.nse
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
diff --git a/src/peerinfo/peerinfo.conf.in b/src/peerinfo/peerinfo.conf.in
index 8615a8866..14a41655b 100644
--- a/src/peerinfo/peerinfo.conf.in
+++ b/src/peerinfo/peerinfo.conf.in
@@ -1,5 +1,5 @@
 [peerinfo]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2090
 HOSTNAME = localhost
 BINARY = gnunet-service-peerinfo
diff --git a/src/peerinfo/test_peerinfo_api_data.conf b/src/peerinfo/test_peerinfo_api_data.conf
index 1522d4dfe..e632c341f 100644
--- a/src/peerinfo/test_peerinfo_api_data.conf
+++ b/src/peerinfo/test_peerinfo_api_data.conf
@@ -5,11 +5,11 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-peerinfo/
 PORT = 22354
 [dns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
diff --git a/src/peerstore/peerstore.conf.in b/src/peerstore/peerstore.conf.in
index a39b61887..a3a7c672b 100644
--- a/src/peerstore/peerstore.conf.in
+++ b/src/peerstore/peerstore.conf.in
@@ -1,5 +1,5 @@
 [peerstore]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2110
 HOSTNAME = localhost
 BINARY = gnunet-service-peerstore
diff --git a/src/peerstore/test_peerstore_api_data.conf b/src/peerstore/test_peerstore_api_data.conf
index 802418fa0..3ebda50eb 100644
--- a/src/peerstore/test_peerstore_api_data.conf
+++ b/src/peerstore/test_peerstore_api_data.conf
@@ -2,7 +2,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-peerstore
 [peerstore]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 BINARY = gnunet-service-peerstore
 UNIXPATH = $GNUNET_TMP/gnunet-service-peerstore.sock
 HOME = $SERVICEHOME
diff --git a/src/psyc/Makefile.am b/src/psyc/Makefile.am
index 61618d176..26db608f3 100644
--- a/src/psyc/Makefile.am
+++ b/src/psyc/Makefile.am
@@ -58,13 +58,13 @@ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PAT
 TESTS = $(check_PROGRAMS)
 endif
-test_psyc_SOURCES = \
+#test_psyc_SOURCES = \
- test_psyc.c
+# test_psyc.c
-test_psyc_LDADD = \
+#test_psyc_LDADD = \
-  libgnunetpsyc.la \
+#  libgnunetpsyc.la \
-  $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
+#  $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+#  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+#  $(top_builddir)/src/util/libgnunetutil.la
 test_psyc2_SOURCES = \
  test_psyc2.c
 test_psyc2_LDADD = \
diff --git a/src/psyc/psyc.conf.in b/src/psyc/psyc.conf.in
index 4a4a96954..764ccfa84 100644
--- a/src/psyc/psyc.conf.in
+++ b/src/psyc/psyc.conf.in
@@ -1,5 +1,5 @@
 [psyc]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 BINARY = gnunet-service-psyc
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psyc.sock
diff --git a/src/psyc/test_psyc.conf b/src/psyc/test_psyc.conf
index 4e2563a8a..6ff031f0d 100644
--- a/src/psyc/test_psyc.conf
+++ b/src/psyc/test_psyc.conf
@@ -16,13 +16,13 @@ ID_ANNOUNCE_TIME = 5 s
 ENABLE_UPNP = NO
 [psyc]
-FORCESTART = YES
+IMMEDIATE_START = YES
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [multicast]
-FORCESTART = YES
+IMMEDIATE_START = YES
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [psycstore]
-FORCESTART = YES
+IMMEDIATE_START = YES
-AUTOSTART = YES
+START_ON_DEMAND = YES
diff --git a/src/psycstore/psycstore.conf.in b/src/psycstore/psycstore.conf.in
index 82e9e67c2..3905db173 100644
--- a/src/psycstore/psycstore.conf.in
+++ b/src/psycstore/psycstore.conf.in
@@ -1,5 +1,5 @@
 [psycstore]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 BINARY = gnunet-service-psycstore
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psycstore.sock
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf
index c603b7422..85dd08113 100644
--- a/src/pt/test_gns_vpn.conf
+++ b/src/pt/test_gns_vpn.conf
@@ -7,11 +7,11 @@ PLUGINS = tcp
 [arm]
 PORT = 0
 ALLOW_SHUTDOWN = YES
-SYSTEM_ONLY = NO
+START_SYSTEM_SERVICES = NO
-USER_ONLY = NO
+START_USER_SERVICES = NO
 [exit]
-FORCESTART = YES
+IMMEDIATE_START = YES
 IPV6ADDR = FC5A:04E1:C2BA::1
 IPV6PREFIX = 96
 IPV4ADDR = 169.254.86.1
@@ -25,19 +25,19 @@ EXIT_IFNAME = eth1
 [dns]
 DNS_EXIT = 8.8.8.8
-FORCESTART = YES
+IMMEDIATE_START = YES
 [identity]
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 [hostlist]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [zonemaster]
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 #[vpn]
 #PREFIX = valgrind
@@ -61,15 +61,15 @@ TCP_REDIRECTS = 80:localhost4:8080
 TTL = 3600000
 [gns]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 ZONEKEY = $GNUNET_TEST_HOME/.zonekey
 # Delays starting of GNS, as we need to first
 # setup the identity subsystem properly.
-FORCESTART = NO
+IMMEDIATE_START = NO
 [namestore]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [nat]
 USE_LOCALADDR = YES
diff --git a/src/pt/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf
index c22cd3409..9bee93e02 100644
--- a/src/pt/test_gnunet_vpn.conf
+++ b/src/pt/test_gnunet_vpn.conf
@@ -9,7 +9,7 @@ PORT = 0
 ALLOW_SHUTDOWN = YES
 [exit]
-FORCESTART = YES
+IMMEDIATE_START = YES
 EXIT_IPV4 = YES
 EXIT_IPV6 = YES
 IPV6ADDR = FC5A:04E1:C2BA::1
@@ -21,8 +21,8 @@ IPV4MASK = 255.255.255.0
 EXIT_IFNAME = eth1
 [hostlist]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [nse]
 WORKBITS = 1
@@ -38,11 +38,11 @@ IPV4MASK = 255.255.255.0
 [gns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [nat]
 USE_LOCALADDR = YES
 RETURN_LOCAL_ADDRESSES = YES
 [consensus]
-AUTOSTART = NO
+START_ON_DEMAND = NO
diff --git a/src/regex/regex.conf.in b/src/regex/regex.conf.in
index 8a75881f9..5e68a43da 100644
--- a/src/regex/regex.conf.in
+++ b/src/regex/regex.conf.in
@@ -1,5 +1,5 @@
 [regex]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @UNIXONLY@ PORT = 2107
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-regex.sock
 HOSTNAME = localhost
diff --git a/src/regex/test_regex_api_data.conf b/src/regex/test_regex_api_data.conf
index 60dcdc0b6..40fee1e54 100644
--- a/src/regex/test_regex_api_data.conf
+++ b/src/regex/test_regex_api_data.conf
@@ -19,11 +19,11 @@ WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 PORT = 12370
 [regex]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [transport]
 plugins = tcp
diff --git a/src/revocation/revocation.conf.in b/src/revocation/revocation.conf.in
index 333f2e488..d7ad174c9 100644
--- a/src/revocation/revocation.conf.in
+++ b/src/revocation/revocation.conf.in
@@ -1,6 +1,6 @@
 [revocation]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
-FORCESTART = YES
+IMMEDIATE_START = YES
 @JAVAPORT@PORT = 2112
 HOSTNAME = localhost
 BINARY = gnunet-service-revocation
diff --git a/src/revocation/test_revocation.conf b/src/revocation/test_revocation.conf
index 14ecf6064..3b04150c1 100644
--- a/src/revocation/test_revocation.conf
+++ b/src/revocation/test_revocation.conf
@@ -6,7 +6,7 @@ SERVICEHOME=$GNUNET_TMP/test-revocation-service
 [revocation]
 WORKBITS = 3
-FORCESTART = YES
+IMMEDIATE_START = YES
 [identity]
 # Directory where we store information about our egos
diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c
index 4a7a89b15..b43ce2fa2 100644
--- a/src/rps/gnunet-rps-profiler.c
+++ b/src/rps/gnunet-rps-profiler.c
@@ -48,12 +48,6 @@ static unsigned bits_needed;
 /**
 * How long do we run the test?
- * In seconds.
- */
-static uint32_t timeout_s;
-/**
- * How long do we run the test?
 */
 //#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 static struct GNUNET_TIME_Relative timeout;
@@ -948,6 +942,8 @@ post_test_op (void *cls)
  if (NO_COLLECT_STATISTICS == cur_test_run.have_collect_statistics ||
      GNUNET_YES == check_statistics_collect_completed())
  {
+    GNUNET_SCHEDULER_cancel (shutdown_task);
+    shutdown_task = GNUNET_SCHEDULER_add_now (&shutdown_op, NULL);
    GNUNET_SCHEDULER_shutdown ();
  }
 }
@@ -2570,10 +2566,9 @@ test_run (void *cls,
  if (NULL != churn_task)
    GNUNET_SCHEDULER_cancel (churn_task);
  post_test_task = GNUNET_SCHEDULER_add_delayed (timeout, &post_test_op, NULL);
-  timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
+  timeout = GNUNET_TIME_relative_multiply (timeout, 1 + (0.1 * num_peers));
-      (timeout_s * 1.2) + 0.1 * num_peers);
-  shutdown_task = GNUNET_SCHEDULER_add_delayed (timeout, &shutdown_op, NULL);
  shutdown_task = GNUNET_SCHEDULER_add_shutdown (shutdown_op, NULL);
+  shutdown_task = GNUNET_SCHEDULER_add_delayed (timeout, &shutdown_op, NULL);
 }
@@ -2598,7 +2593,7 @@ run (void *cls,
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "This is the profiler\n");
  cur_test_run.name = "test-rps-profiler";
-  num_peers = 10;
+  if (0 == num_peers) num_peers = 10;
  mal_type = 3;
  cur_test_run.init_peer = profiler_init_peer;
  //cur_test_run.pre_test = mal_pre;
@@ -2608,7 +2603,7 @@ run (void *cls,
  cur_test_run.eval_cb = profiler_eval;
  cur_test_run.post_test = post_profiler;
  cur_test_run.request_interval = 2;
-  cur_test_run.num_requests = 5;
+  if (0 == cur_test_run.num_requests) cur_test_run.num_requests = 5;
  //cur_test_run.have_churn = HAVE_CHURN;
  cur_test_run.have_churn = HAVE_NO_CHURN;
  cur_test_run.have_quick_quit = HAVE_NO_QUICK_QUIT;
@@ -2630,20 +2625,22 @@ run (void *cls,
                                    BIT(STAT_TYPE_RECV_PULL_REQ) |
                                    BIT(STAT_TYPE_RECV_PULL_REP);
  cur_test_run.have_collect_view = COLLECT_VIEW;
-  timeout_s = 300;
  /* 'Clean' directory */
  (void) GNUNET_DISK_directory_remove ("/tmp/rps/");
  GNUNET_DISK_directory_create ("/tmp/rps/");
-  timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, timeout_s);
+  if (0 == timeout.rel_value_us)
+  {
+    timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90);
+  }
  /* Compute number of bits for representing largest peer id */
-  for (bits_needed = 1; (bits_needed << 1) < num_peers - 1; bits_needed++)
+  for (bits_needed = 1; (1 << bits_needed) < num_peers; bits_needed++)
    ;
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-            "Need %u bits to represent largest peer id %" PRIu32 "\n",
+            "Need %u bits to represent %" PRIu32 " peers\n",
             bits_needed,
-             num_peers - 1);
+             num_peers);
  rps_peers = GNUNET_new_array (num_peers, struct RPSPeer);
  peer_map = GNUNET_CONTAINER_multipeermap_create (num_peers, GNUNET_NO);
@@ -2686,10 +2683,23 @@ main (int argc, char *argv[])
  int ret_value;
  struct GNUNET_GETOPT_CommandLineOption options[] = {
    GNUNET_GETOPT_option_uint ('n',
-                               "peers",
+                               "num-peers",
                               "COUNT",
                               gettext_noop ("number of peers to start"),
                               &num_peers),
+    GNUNET_GETOPT_option_relative_time ('t',
+                                        "timeout",
+                                        "TIMEOUT",
+                                        gettext_noop ("timeout for the profiling"),
+                                        &timeout),
+    GNUNET_GETOPT_option_uint ('r',
+                               "num-requests",
+                               "COUNT",
+                               gettext_noop ("number of PeerIDs to request"),
+                               &cur_test_run.num_requests),
    GNUNET_GETOPT_OPTION_END
  };
diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index 9e81330bd..1b9681663 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -69,6 +69,12 @@ static struct GNUNET_STATISTICS_Handle *stats;
 static struct GNUNET_PeerIdentity own_identity;
+/**
+ * @brief Port used for cadet.
+ *
+ * Don't compute multiple times through making it global
+ */
+static struct GNUNET_HashCode port;
 /***********************************************************************
 * Old gnunet-service-rps_peers.c
@@ -578,7 +584,6 @@ struct GNUNET_CADET_Channel *
 get_channel (const struct GNUNET_PeerIdentity *peer)
 {
  struct PeerContext *peer_ctx;
-  struct GNUNET_HashCode port;
  struct GNUNET_PeerIdentity *ctx_peer;
  /* There exists a copy-paste-clone in run() */
  struct GNUNET_MQ_MessageHandler cadet_handlers[] = {
@@ -608,9 +613,6 @@ get_channel (const struct GNUNET_PeerIdentity *peer)
    LOG (GNUNET_ERROR_TYPE_DEBUG,
         "Trying to establish channel to peer %s\n",
         GNUNET_i2s (peer));
-    GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_RPS,
-                        strlen (GNUNET_APPLICATION_PORT_RPS),
-                        &port);
    ctx_peer = GNUNET_new (struct GNUNET_PeerIdentity);
    *ctx_peer = *peer;
    peer_ctx->send_channel =
@@ -3164,7 +3166,6 @@ handle_peer_check (void *cls,
  LOG (GNUNET_ERROR_TYPE_DEBUG,
      "Received CHECK_LIVE (%s)\n", GNUNET_i2s (peer));
-  GNUNET_break_op (Peers_check_peer_known (peer));
  GNUNET_CADET_receive_done (Peers_get_recv_channel (peer));
 }
@@ -4247,7 +4248,6 @@ run (void *cls,
     struct GNUNET_SERVICE_Handle *service)
 {
  char* fn_valid_peers;
-  struct GNUNET_HashCode port;
  GNUNET_log_setup ("rps", GNUNET_error_type_to_string (GNUNET_ERROR_TYPE_DEBUG), NULL);
  cfg = c;
diff --git a/src/rps/rps.conf.in b/src/rps/rps.conf.in
index 733b72601..7f0a419bd 100644
--- a/src/rps/rps.conf.in
+++ b/src/rps/rps.conf.in
@@ -1,5 +1,5 @@
 [rps]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 BINARY = gnunet-service-rps
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-rps.sock
 HOME = $SERVICEHOME
diff --git a/src/rps/test_rps.conf b/src/rps/test_rps.conf
index e4ed111e2..05bb9f444 100644
--- a/src/rps/test_rps.conf
+++ b/src/rps/test_rps.conf
@@ -5,8 +5,8 @@ UNIXPATH = $GNUNET_TMP/gnunet-service-rps.sock
 HOME = $SERVICEHOME
 # PORT = 2106
 #@UNIXONLY@ PORT = 2087
-FORCESTART = YES
+IMMEDIATE_START = YES
-AUTOSTART = NO
+START_ON_DEMAND = NO
 NOARMBIND = YES
 #OPTIONS=-l /tmp/rps_profiler_logs/rps-[]-%Y-%m-%d.log
@@ -21,17 +21,24 @@ FILENAME_VALID_PEERS = $GNUNET_DATA_HOME/rps/valid_peers.txt
 # So, 50 is enough for a network of size 50^3 = 125000
 MINSIZE = 4
 [testbed]
 HOSTNAME = localhost
-# OPERATION_TIMEOUT = 60 s
 # MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 100
-OVERLAY_TOPOLOGY = CLIQUE
-#OVERLAY_TOPOLOGY = SMALL_WORLD
-#SCALE_FREE_TOPOLOGY_CAP =
-# OVERLAY_RANDOM_LINKS = 25
+#OVERLAY_TOPOLOGY = CLIQUE
+OVERLAY_TOPOLOGY = SCALE_FREE
+SCALE_FREE_TOPOLOGY_CAP = 100
+SCALE_FREE_TOPOLOGY_M = 2
+#OVERLAY_TOPOLOGY = RANDOM
+#OVERLAY_RANDOM_LINKS = 25
+#OVERLAY_TOPOLOGY = SMALL_WORLD
+#OVERLAY_RANDOM_LINKS = 25
 SETUP_TIMEOUT = 2 m
@@ -41,12 +48,13 @@ WORKBITS = 0
 [nat]
 # Use addresses from the local network interfaces (inluding loopback, but also others)
 USE_LOCALADDR = YES
+ENABLE_UPNP = NO
 # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8)
 RETURN_LOCAL_ADDRESSES = YES
 [transport]
-PLUGINS = udp
+PLUGINS = unix
 [ats]
 # Network specific inbound/outbound quotas
@@ -72,7 +80,6 @@ BLUETOOTH_QUOTA_OUT = unlimited
 DISABLE_TRY_CONNECT = YES
 [cadet]
-DISABLE_TRY_CONNECT = YES
 #OPTIONS=-l /tmp/rps_profiler_logs/cadet-[]-%Y-%m-%d.log
 #PREFIX = valgrind
@@ -80,44 +87,44 @@ DISABLE_TRY_CONNECT = YES
 #GLOBAL_POSTFIX=-l /tmp/rps_profiler_logs/other-[]-%Y-%m-%d.log
 #[statistics]
-#FORCESTART = NO
+#IMMEDIATE_START = NO
-#AUTOSTART = NO
+#START_ON_DEMAND = NO
 [peerinfo]
 NO_IO = YES
 [hostlist]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [zonemaster]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [namecache]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [namestore]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [topology]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [vpn]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [revocation]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [gns]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [fs]
-FORCESTART = NO
+IMMEDIATE_START = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
diff --git a/src/scalarproduct/scalarproduct.conf.in b/src/scalarproduct/scalarproduct.conf.in
index e2a0c7ad7..e2286b076 100644
--- a/src/scalarproduct/scalarproduct.conf.in
+++ b/src/scalarproduct/scalarproduct.conf.in
@@ -1,5 +1,5 @@
 [scalarproduct-alice]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 BINARY = gnunet-service-scalarproduct-ecc-alice
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-scalarproduct-alice.sock
 @UNIXONLY@ PORT = 2117
@@ -12,7 +12,7 @@ UNIX_MATCH_GID = YES
 [scalarproduct-bob]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 HOSTNAME = localhost
 BINARY = gnunet-service-scalarproduct-ecc-bob
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-scalarproduct-bob.sock
diff --git a/src/secretsharing/secretsharing.conf.in b/src/secretsharing/secretsharing.conf.in
index 0834235d4..bd8da6177 100644
--- a/src/secretsharing/secretsharing.conf.in
+++ b/src/secretsharing/secretsharing.conf.in
@@ -1,5 +1,5 @@
 [secretsharing]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 @JAVAPORT@PORT = 2114
 HOSTNAME = localhost
 BINARY = gnunet-service-secretsharing
diff --git a/src/secretsharing/test_secretsharing.conf b/src/secretsharing/test_secretsharing.conf
index 9980666cd..3391c88db 100644
--- a/src/secretsharing/test_secretsharing.conf
+++ b/src/secretsharing/test_secretsharing.conf
@@ -1,10 +1,10 @@
 [secretsharing]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 #PREFIX = valgrind --leak-check=full
 OPTIONS = -LINFO
 [consensus]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [transport]
 OPTIONS = -LERROR
@@ -12,7 +12,7 @@ PLUGINS = unix
 [set]
 OPTIONS = -L INFO
-AUTOSTART = YES
+START_ON_DEMAND = YES
 #PREFIX = valgrind --leak-check=full
 [testbed]
@@ -32,5 +32,5 @@ DISABLEV6 = NO
 RETURN_LOCAL_ADDRESSES = YES
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
diff --git a/src/set/set.conf.in b/src/set/set.conf.in
index deaa07efb..66bcfa169 100644
--- a/src/set/set.conf.in
+++ b/src/set/set.conf.in
@@ -1,5 +1,5 @@
 [set]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @UNIXONLY@PORT = 2106
 HOSTNAME = localhost
 BINARY = gnunet-service-set
diff --git a/src/set/test_set.conf b/src/set/test_set.conf
index 02afd2ec5..21fe984f8 100644
--- a/src/set/test_set.conf
+++ b/src/set/test_set.conf
@@ -4,7 +4,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-set/
 [set]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 #PREFIX = valgrind --leak-check=full
 #PREFIX = gdbserver :1234
 OPTIONS = -L INFO
diff --git a/src/social/social.conf.in b/src/social/social.conf.in
index 33b14e5b4..3fe754c80 100644
--- a/src/social/social.conf.in
+++ b/src/social/social.conf.in
@@ -1,7 +1,7 @@
 [social]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 BINARY = gnunet-service-social
-USER_SERVICE = YES
+RUN_PER_USER = YES
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-social.sock
 UNIX_MATCH_UID = YES
diff --git a/src/social/test_social.conf b/src/social/test_social.conf
index df9815fd2..bc487760f 100644
--- a/src/social/test_social.conf
+++ b/src/social/test_social.conf
@@ -4,7 +4,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-social/
 [social]
-FORCESTART = YES
+IMMEDIATE_START = YES
 [transport]
 PLUGINS = tcp
diff --git a/src/statistics/gnunet-statistics.c b/src/statistics/gnunet-statistics.c
index 648fc89bb..a92faa3d7 100644
--- a/src/statistics/gnunet-statistics.c
+++ b/src/statistics/gnunet-statistics.c
@@ -39,6 +39,11 @@ static int ret;
 static char *subsystem;
 /**
+ * The path of the testbed data.
+ */
+static char *path_testbed;
+/**
 * Set to the specific stat value that we are after (or NULL for all).
 */
 static char *name;
@@ -59,6 +64,11 @@ static int watch;
 static int quiet;
 /**
+ * @brief Separator string for csv.
+ */
+static char *csv_separator;
+/**
 * Remote host
 */
 static char *remote_host;
@@ -79,10 +89,169 @@ static unsigned long long set_val;
 static int set_value;
 /**
- * Handle for pending GET operation.
+ * @brief Representation of all (testbed) nodes.
+ */
+static struct Node {
+  /**
+   * @brief Index of the node in this array.
+   */
+  unsigned index_node;
+  /**
+   * @brief Configuration handle for this node
+   */
+  struct GNUNET_CONFIGURATION_Handle *conf;
+  /**
+   * Handle for pending GET operation.
+   */
+  struct GNUNET_STATISTICS_GetHandle *gh;
+  /**
+   * @brief Statistics handle nodes.
+   */
+  struct GNUNET_STATISTICS_Handle *handle;
+  /**
+   * @brief Identifier for shutdown task for this node.
+   */
+  struct GNUNET_SCHEDULER_Task *shutdown_task;
+} *nodes;
+/**
+ * @brief Number of configurations of all (testbed) nodes.
+ */
+static unsigned num_nodes;
+/**
+ * @brief Set of values for a combination of subsystem and name.
+ */
+struct ValueSet
+{
+  /**
+   * @brief Subsystem of the valueset.
+   */
+  char *subsystem;
+  /**
+   * @brief Name of the valueset.
+   */
+  char *name;
+  /**
+   * @brief The values.
+   */
+  uint64_t *values;
+  /**
+   * @brief Persistence of the values.
+   */
+  int is_persistent;
+};
+/**
+ * @brief Collection of all values (represented with #ValueSet).
+ */
+static struct GNUNET_CONTAINER_MultiHashMap *values;
+/**
+ * @brief Number of nodes that have their values ready.
+ */
+static int num_nodes_ready;
+/**
+ * @brief Number of nodes that have their values ready.
+ */
+static int num_nodes_ready_shutdown;
+/**
+ * @brief Create a new #ValueSet
+ *
+ * @param subsystem Subsystem of the valueset.
+ * @param name Name of the valueset.
+ * @param num_values Number of values in valueset - number of peers.
+ * @param is_persistent Persistence status of values.
+ *
+ * @return Newly allocated #ValueSet.
 */
-static struct GNUNET_STATISTICS_GetHandle *gh;
+static struct ValueSet *
+new_value_set (const char *subsystem,
+               const char *name,
+               unsigned num_values,
+               int is_persistent)
+{
+  struct ValueSet *value_set;
+  value_set = GNUNET_new (struct ValueSet);
+  value_set->subsystem = GNUNET_strdup (subsystem);
+  value_set->name = GNUNET_strdup (name);
+  value_set->values = GNUNET_new_array (num_values, uint64_t);
+  value_set->is_persistent = persistent;
+  return value_set;
+}
+/**
+ * @brief Print the (collected) values.
+ *
+ * Implements #GNUNET_CONTAINER_HashMapIterator.
+ *
+ * @param cls Closure - unused
+ * @param key #GNUNET_HashCode key of #GNUNET_CONTAINER_MultiHashMap iterator -
+ *        unused
+ * @param value Values represented as #ValueSet.
+ *
+ * @return GNUNET_YES - continue iteration.
+ */
+static int
+printer (void *cls,
+         const struct GNUNET_HashCode *key,
+         void *value)
+{
+  struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get();
+  const char *now_str;
+  struct ValueSet *value_set = value;
+  if (quiet == GNUNET_NO)
+  {
+    if (GNUNET_YES == watch)
+    {
+      now_str = GNUNET_STRINGS_absolute_time_to_string (now);
+      FPRINTF (stdout,
+               "%24s%s %s%s%12s%s %50s%s ",
+               now_str,
+               csv_separator,
+               value_set->is_persistent ? "!" : " ",
+               csv_separator,
+               value_set->subsystem,
+               csv_separator,
+                     _(value_set->name),
+               (0 == strlen (csv_separator) ? ":": csv_separator));
+    }
+    else
+    {
+      FPRINTF (stdout,
+               "%s%s%12s%s %50s%s ",
+               value_set->is_persistent ? "!" : " ",
+               csv_separator,
+               value_set->subsystem,
+               csv_separator,
+               _(value_set->name),
+               (0 == strlen (csv_separator) ? ":": csv_separator));
+    }
+  }
+  for (unsigned i = 0; i < num_nodes; i++)
+  {
+    FPRINTF (stdout,
+            "%16llu%s",
+            (unsigned long long) value_set->values[i],
+            csv_separator);
+  }
+  FPRINTF (stdout, "\n");
+  GNUNET_free (value_set->subsystem);
+  GNUNET_free (value_set->name);
+  GNUNET_free (value_set->values);
+  GNUNET_free (value_set);
+  return GNUNET_YES;
+}
 /**
 * Callback function to process statistic values.
@@ -95,11 +264,11 @@ static struct GNUNET_STATISTICS_GetHandle *gh;
 * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration
 */
 static int
-printer (void *cls,
+printer_watch (void *cls,
-         const char *subsystem,
+               const char *subsystem,
-         const char *name,
+               const char *name,
-         uint64_t value,
+               uint64_t value,
-         int is_persistent)
+               int is_persistent)
 {
  struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get();
  const char *now_str;
@@ -110,21 +279,28 @@ printer (void *cls,
    {
      now_str = GNUNET_STRINGS_absolute_time_to_string (now);
      FPRINTF (stdout,
-               "%24s %s%12s %50s: %16llu\n",
+               "%24s%s %s%s%12s%s %50s%s %16llu\n",
               now_str,
+               csv_separator,
               is_persistent ? "!" : " ",
+               csv_separator,
               subsystem,
-               _(name),
+               csv_separator,
-               (unsigned long long) value);
+               _(name),
+               (0 == strlen (csv_separator) ? ":": csv_separator),
+               (unsigned long long) value);
    }
    else
    {
      FPRINTF (stdout,
-               "%s%12s %50s: %16llu\n",
+               "%s%s%12s%s %50s%s %16llu\n",
               is_persistent ? "!" : " ",
+               csv_separator,
               subsystem,
-               _(name),
+               csv_separator,
-               (unsigned long long) value);
+               _(name),
+               (0 == strlen (csv_separator) ? ":": csv_separator),
+               (unsigned long long) value);
    }
  }
  else
@@ -135,6 +311,111 @@ printer (void *cls,
  return GNUNET_OK;
 }
+/**
+ * @brief Clean all data structures related to given node.
+ *
+ * Also clears global structures if we are the last node to clean.
+ *
+ * @param cls the index of the node
+ */
+static void
+clean_node (void *cls)
+{
+  const unsigned index_node = *(unsigned *) cls;
+  struct GNUNET_STATISTICS_Handle *h;
+  struct GNUNET_STATISTICS_GetHandle *gh;
+  if ( (NULL != path_testbed) && /* were issued with -t <testbed-path> option */
+       (NULL != nodes[index_node].conf) )
+  {
+    GNUNET_CONFIGURATION_destroy (nodes[index_node].conf);
+    nodes[index_node].conf = NULL;
+  }
+  h = nodes[index_node].handle;
+  gh = nodes[index_node].gh;
+  if (NULL != gh)
+  {
+    GNUNET_STATISTICS_get_cancel (gh);
+    gh = NULL;
+  }
+  if (GNUNET_YES == watch)
+  {
+    GNUNET_assert (GNUNET_OK ==
+      GNUNET_STATISTICS_watch_cancel (h,
+                                      subsystem,
+                                      name,
+                                      &printer_watch,
+                                      &nodes[index_node].index_node));
+  }
+  if (NULL != h)
+  {
+    GNUNET_STATISTICS_destroy (h, GNUNET_NO);
+    h = NULL;
+  }
+  num_nodes_ready_shutdown++;
+  if (num_nodes == num_nodes_ready_shutdown)
+  {
+    GNUNET_array_grow (nodes, num_nodes, 0);
+    GNUNET_CONTAINER_multihashmap_destroy (values);
+  }
+}
+/**
+ * @brief Print and shutdown
+ *
+ * @param cls unused
+ */
+static void
+print_finish (void *cls)
+{
+  GNUNET_CONTAINER_multihashmap_iterate (values, printer, NULL);
+  GNUNET_SCHEDULER_shutdown();
+}
+/**
+ * @brief Called once all statistic values are available.
+ *
+ * Implements #GNUNET_STATISTICS_Callback
+ *
+ * @param cls Closure - The index of the node.
+ * @param succes Whether statistics were obtained successfully.
+ */
+static void
+continuation_print (void *cls,
+                    int success)
+{
+  const unsigned index_node = *(unsigned *) cls;
+  nodes[index_node].gh = NULL;
+  if (GNUNET_OK != success)
+  {
+    if (NULL == remote_host)
+      FPRINTF (stderr,
+               "%s",
+               _("Failed to obtain statistics.\n"));
+    else
+      FPRINTF (stderr,
+               _("Failed to obtain statistics from host `%s:%llu'\n"),
+               remote_host,
+               remote_port);
+    ret = 1;
+  }
+  if (NULL != nodes[index_node].shutdown_task)
+  {
+    GNUNET_SCHEDULER_cancel (nodes[index_node].shutdown_task);
+    nodes[index_node].shutdown_task = NULL;
+  }
+  GNUNET_SCHEDULER_add_now (clean_node, &nodes[index_node].index_node);
+  num_nodes_ready++;
+  if (num_nodes_ready == num_nodes)
+  {
+    GNUNET_SCHEDULER_add_now (print_finish, NULL);
+  }
+}
 /**
 * Function called last by the statistics code.
@@ -147,7 +428,10 @@ static void
 cleanup (void *cls,
         int success)
 {
-  gh = NULL;
+  for (unsigned i = 0; i < num_nodes; i++)
+  {
+    nodes[i].gh = NULL;
+  }
  if (GNUNET_OK != success)
  {
    if (NULL == remote_host)
@@ -164,39 +448,56 @@ cleanup (void *cls,
  GNUNET_SCHEDULER_shutdown ();
 }
 /**
- * Function run on shutdown to clean up.
+ * @brief Iterate over statistics values and store them in #values.
+ * They will be printed once all are available.
 *
- * @param cls the statistics handle
+ * @param cls Cosure - Node index.
+ * @param subsystem Subsystem of the value.
+ * @param name Name of the value.
+ * @param value Value itself.
+ * @param is_persistent Persistence.
+ *
+ * @return GNUNET_OK - continue.
 */
-static void
+static int
-shutdown_task (void *cls)
+collector (void *cls,
+           const char *subsystem,
+           const char *name,
+           uint64_t value,
+           int is_persistent)
 {
-  struct GNUNET_STATISTICS_Handle *h = cls;
+  const unsigned index_node = *(unsigned *) cls;
+  struct GNUNET_HashCode *key;
-  if (NULL == h)
+  struct GNUNET_HashCode hc;
-    return;
+  char *subsys_name;
-  if (NULL != gh)
+  unsigned len_subsys_name;
+  struct ValueSet *value_set;
+  len_subsys_name = strlen (subsystem) + 3 + strlen (name) + 1;
+  subsys_name = GNUNET_malloc (len_subsys_name);
+  SPRINTF (subsys_name, "%s---%s", subsystem, name);
+  key = &hc;
+  GNUNET_CRYPTO_hash (subsys_name, len_subsys_name, key);
+  GNUNET_free (subsys_name);
+  if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (values, key))
  {
-    GNUNET_STATISTICS_get_cancel (gh);
+    // get
-    gh = NULL;
+    value_set = GNUNET_CONTAINER_multihashmap_get (values, key);
  }
-  if ( (GNUNET_YES == watch) &&
+  else
-       (NULL != subsystem) &&
+  {
-       (NULL != name) )
+    // new
-    GNUNET_assert (GNUNET_OK ==
+    value_set = new_value_set (subsystem, name, num_nodes, is_persistent);
-                   GNUNET_STATISTICS_watch_cancel (h,
+  }
-                                                   subsystem,
+  // write
-                                                   name,
+  value_set->values[index_node] = value;
-                                                   &printer,
+  // put
-                                                   h));
+  GNUNET_CONTAINER_multihashmap_put (values, key, value_set,
-  GNUNET_STATISTICS_destroy (h,
+      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
-                             GNUNET_NO);
+  return GNUNET_OK;
-  h = NULL;
 }
 /**
 * Main task that does the actual work.
 *
@@ -205,8 +506,8 @@ shutdown_task (void *cls)
 static void
 main_task (void *cls)
 {
-  const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  unsigned index_node = *(unsigned *) cls;
-  struct GNUNET_STATISTICS_Handle *h;
+  const struct GNUNET_CONFIGURATION_Handle *cfg = nodes[index_node].conf;
  if (set_value)
  {
@@ -226,23 +527,23 @@ main_task (void *cls)
      ret = 1;
      return;
    }
-    h = GNUNET_STATISTICS_create (subsystem,
+    nodes[index_node].handle = GNUNET_STATISTICS_create (subsystem,
                                  cfg);
-    if (NULL == h)
+    if (NULL == nodes[index_node].handle)
    {
      ret = 1;
      return;
    }
-    GNUNET_STATISTICS_set (h,
+    GNUNET_STATISTICS_set (nodes[index_node].handle,
                           name,
                           (uint64_t) set_val,
                           persistent);
-    GNUNET_STATISTICS_destroy (h,
+    GNUNET_STATISTICS_destroy (nodes[index_node].handle,
                               GNUNET_YES);
-    h = NULL;
+    nodes[index_node].handle = NULL;
    return;
  }
-  if (NULL == (h = GNUNET_STATISTICS_create ("gnunet-statistics",
+  if (NULL == (nodes[index_node].handle = GNUNET_STATISTICS_create ("gnunet-statistics",
                                             cfg)))
  {
    ret = 1;
@@ -251,13 +552,13 @@ main_task (void *cls)
  if (GNUNET_NO == watch)
  {
    if (NULL ==
-        (gh = GNUNET_STATISTICS_get (h,
+        (nodes[index_node].gh = GNUNET_STATISTICS_get (nodes[index_node].handle,
-                                     subsystem,
+                                                       subsystem,
-                                     name,
+                                                       name,
-                                     &cleanup,
+                                                       &continuation_print,
-                                     &printer,
+                                                       &collector,
-                                     h)) )
+                                     &nodes[index_node].index_node)) )
-      cleanup (h,
+      cleanup (nodes[index_node].handle,
               GNUNET_SYSERR);
  }
  else
@@ -266,30 +567,128 @@ main_task (void *cls)
         (NULL == name) )
    {
      printf (_("No subsystem or name given\n"));
-      GNUNET_STATISTICS_destroy (h,
+      GNUNET_STATISTICS_destroy (nodes[index_node].handle,
                                 GNUNET_NO);
-      h = NULL;
+      nodes[index_node].handle = NULL;
      ret = 1;
      return;
    }
    if (GNUNET_OK !=
-        GNUNET_STATISTICS_watch (h,
+        GNUNET_STATISTICS_watch (nodes[index_node].handle,
                                 subsystem,
                                 name,
-                                 &printer,
+                                 &printer_watch,
-                                 h))
+                                 &nodes[index_node].index_node))
    {
      fprintf (stderr,
               _("Failed to initialize watch routine\n"));
-      GNUNET_SCHEDULER_add_now (&shutdown_task,
+      nodes[index_node].shutdown_task =
-                                h);
+        GNUNET_SCHEDULER_add_now (&clean_node,
+                                  &nodes[index_node].index_node);
      return;
    }
  }
-  GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+  nodes[index_node].shutdown_task =
-                                 h);
+    GNUNET_SCHEDULER_add_shutdown (&clean_node,
+                                   &nodes[index_node].index_node);
 }
+/**
+ * @brief Iter over content of a node's directory to check for existence of a
+ * config file.
+ *
+ * Implements #GNUNET_FileNameCallback
+ *
+ * @param cls pointer to indicate success
+ * @param filename filename inside the directory of the potential node
+ *
+ * @return to continue iteration or not to
+ */
+static int
+iter_check_config (void *cls,
+                   const char *filename)
+{
+  if (0 == strncmp (GNUNET_STRINGS_get_short_name (filename), "config", 6))
+  {
+    /* Found the config - stop iteration successfully */
+    GNUNET_array_grow (nodes, num_nodes, num_nodes+1);
+    nodes[num_nodes-1].conf = GNUNET_CONFIGURATION_create();
+    nodes[num_nodes-1].index_node = num_nodes-1;
+    if (GNUNET_OK != GNUNET_CONFIGURATION_load (nodes[num_nodes-1].conf, filename))
+    {
+      FPRINTF (stderr, "Failed loading config `%s'\n", filename);
+      return GNUNET_SYSERR;
+    }
+    return GNUNET_NO;
+  }
+  else
+  {
+    /* Continue iteration */
+    return GNUNET_OK;
+  }
+}
+/**
+ * @brief Iterates over filenames in testbed directory.
+ *
+ * Implements #GNUNET_FileNameCallback
+ *
+ * Checks if the file is a directory for a testbed node
+ * and counts the nodes.
+ *
+ * @param cls counter of nodes
+ * @param filename full path of the file in testbed
+ *
+ * @return status whether to continue iteration
+ */
+static int
+iter_testbed_path (void *cls,
+                   const char *filename)
+{
+  unsigned index_node;
+  GNUNET_assert (NULL != filename);
+  if (1 == SSCANF (GNUNET_STRINGS_get_short_name (filename),
+                  "%u",
+                  &index_node))
+  {
+    if (-1 == GNUNET_DISK_directory_scan (filename,
+                                          iter_check_config,
+                                          NULL))
+    {
+      /* This is probably no directory for a testbed node
+       * Go on with iteration */
+      return GNUNET_OK;
+    }
+    return GNUNET_OK;
+  }
+  return GNUNET_OK;
+}
+/**
+ * @brief Count the number of nodes running in the testbed
+ *
+ * @param path_testbed path to the testbed data
+ *
+ * @return number of running nodes
+ */
+static int
+discover_testbed_nodes (const char *path_testbed)
+{
+  int num_dir_entries;
+  num_dir_entries = GNUNET_DISK_directory_scan (path_testbed,
+                                                iter_testbed_path,
+                                                NULL);
+  if (-1 == num_dir_entries)
+  {
+    FPRINTF (stderr,
+            "Failure during scanning directory `%s'\n",
+            path_testbed);
+    return -1;
+  }
+  return 0;
+}
 /**
 * Main function that will be run by the scheduler.
@@ -309,6 +708,7 @@ run (void *cls,
  c = (struct GNUNET_CONFIGURATION_Handle *) cfg;
  set_value = GNUNET_NO;
+  if (NULL == csv_separator) csv_separator = "";
  if (NULL != args[0])
  {
    if (1 != SSCANF (args[0],
@@ -361,8 +761,34 @@ run (void *cls,
                                           "PORT",
                                           remote_port);
  }
-  GNUNET_SCHEDULER_add_now (&main_task,
+  if (NULL == path_testbed)
-                            c);
+  {
+    values = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO);
+    GNUNET_array_grow (nodes, num_nodes, 1);
+    nodes[0].index_node = 0;
+    nodes[0].conf = c;
+    GNUNET_SCHEDULER_add_now (&main_task, &nodes[0].index_node);
+  }
+  else
+  {
+    if (GNUNET_YES == watch)
+    {
+      printf (_("Not able to watch testbed nodes (yet - feel free to implement)\n"));
+      ret = 1;
+      return;
+    }
+    values = GNUNET_CONTAINER_multihashmap_create (4, GNUNET_NO);
+    if (-1 == discover_testbed_nodes (path_testbed))
+    {
+      return;
+    }
+    /* For each config/node collect statistics */
+    for (unsigned i = 0; i < num_nodes; i++)
+    {
+      GNUNET_SCHEDULER_add_now (&main_task,
+              &nodes[i].index_node);
+    }
+  }
 }
@@ -394,6 +820,18 @@ main (int argc, char *const *argv)
                                 gettext_noop ("limit output to the given SUBSYSTEM"),
                                 &subsystem),
+    GNUNET_GETOPT_option_string ('S',
+                                 "csv-separator",
+                                 "CSV_SEPARATOR",
+                                 gettext_noop ("use as csv separator"),
+                                 &csv_separator),
+    GNUNET_GETOPT_option_filename ('t',
+                                  "testbed",
+                                  "TESTBED",
+                                  gettext_noop ("path to the folder containing the testbed data"),
+                                  &path_testbed),
    GNUNET_GETOPT_option_flag ('q',
                                  "quiet",
                                  gettext_noop ("just print the statistics value"),
@@ -409,11 +847,13 @@ main (int argc, char *const *argv)
                                 "REMOTE",
                                 gettext_noop ("connect to remote host"),
                                 &remote_host),
    GNUNET_GETOPT_option_ulong ('o',
                                    "port",
                                    "PORT",
                                    gettext_noop ("port for remote host"),
                                    &remote_port),
    GNUNET_GETOPT_OPTION_END
  };
  remote_port = 0;
diff --git a/src/statistics/statistics.conf.in b/src/statistics/statistics.conf.in
index 2d0011372..36aca538f 100644
--- a/src/statistics/statistics.conf.in
+++ b/src/statistics/statistics.conf.in
@@ -1,5 +1,5 @@
 [statistics]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2088
 HOSTNAME = localhost
 BINARY = gnunet-service-statistics
diff --git a/src/template/template.conf b/src/template/template.conf
index 8c8c179f7..e5f675a5d 100644
--- a/src/template/template.conf
+++ b/src/template/template.conf
@@ -1,5 +1,5 @@
 [template]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 9999
 HOSTNAME = localhost
 BINARY = gnunet-service-template
diff --git a/src/testbed-logger/testbed-logger.conf.in b/src/testbed-logger/testbed-logger.conf.in
index 05ef782ae..288bbed72 100644
--- a/src/testbed-logger/testbed-logger.conf.in
+++ b/src/testbed-logger/testbed-logger.conf.in
@@ -1,5 +1,5 @@
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 @JAVAPORT@ PORT = 2101
 HOSTNAME = localhost
 BINARY = gnunet-service-testbed
@@ -90,7 +90,7 @@ SHARED_SERVICES =
 [testbed-logger]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 @UNIXONLY@ PORT = 2102
 HOSTNAME = localhost
 BINARY = gnunet-service-testbed-logger
@@ -101,7 +101,7 @@ UNIX_MATCH_GID = YES
 [testbed-barrier]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 @UNIXONLY@ PORT = 2103
 HOSTNAME = localhost
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed-barrier.sock
@@ -112,7 +112,7 @@ UNIX_MATCH_GID = YES
 # This section is related to configuring underlay restrictions to simulate
 # connectivity restrictions of NAT boxes
 [testbed-underlay]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 NOARMBIND = YES
 BINARY = gnunet-daemon-testbed-underlay
 # The sqlite3 database file containing information about what underlay
@@ -120,8 +120,8 @@ BINARY = gnunet-daemon-testbed-underlay
 # DBFILE =
 [latency-logger]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 NOARMBIND = YES
 BINARY = gnunet-daemon-latency-logger
 # The sqlite3 database file where the latency values are to be stored
-# DBFILE =
-\ No newline at end of file
+# DBFILE =
diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in
index 8cad6df09..ac0c9c400 100644
--- a/src/testbed/test_testbed_api_barriers.conf.in
+++ b/src/testbed/test_testbed_api_barriers.conf.in
@@ -1,5 +1,5 @@
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
@@ -10,26 +10,26 @@ TOPOLOGY = RANDOM
 PORT = 12366
 [test-barriers]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 12114
 BINARY = /will/be/overwriten/in/test_testbed_api_barriers/
-FORCESTART = YES
+IMMEDIATE_START = YES
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [resolver]
 HOSTNAME = localhost
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [cadet]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [dht]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [dhtcache]
 QUOTA = 1 MB
@@ -41,7 +41,7 @@ ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
 PORT = 12365
-FORCESTART = YES
+IMMEDIATE_START = YES
 [ats]
 WAN_QUOTA_OUT = 3932160
@@ -49,8 +49,8 @@ WAN_QUOTA_IN = 3932160
 [core]
 PORT = 12092
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 USE_EPHEMERAL_KEYS = NO
 [transport-udp]
@@ -61,43 +61,43 @@ PORT = 12368
 GNUNET_TEST_HOME = $GNUNET_TMP/test-testbed/
 [dns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
-FORCESTART = NO
+IMMEDIATE_START = NO
 [gns-helper-service-w32]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [consensus]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [gns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [statistics]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [peerinfo]
 NO_IO = YES
 [set]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [revocation]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
-\ No newline at end of file
+IMMEDIATE_START = NO
diff --git a/src/testbed/test_testbed_api_statistics.conf b/src/testbed/test_testbed_api_statistics.conf
index 65366835d..50d3f2c04 100644
--- a/src/testbed/test_testbed_api_statistics.conf
+++ b/src/testbed/test_testbed_api_statistics.conf
@@ -5,5 +5,5 @@ OVERLAY_TOPOLOGY = 2D_TORUS
 MAX_PARALLEL_SERVICE_CONNECTIONS = 2
 [statistics]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 PORT = 30
diff --git a/src/testbed/test_testbed_api_template.conf b/src/testbed/test_testbed_api_template.conf
index 049829842..381c1bd85 100644
--- a/src/testbed/test_testbed_api_template.conf
+++ b/src/testbed/test_testbed_api_template.conf
@@ -2,7 +2,7 @@
 @INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
@@ -18,11 +18,11 @@ PLUGINS = udp
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
-FORCESTART = YES
+IMMEDIATE_START = YES
 # Transport requires resolver when connecting to a peer, so enable it
 [resolver]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 [ats]
 WAN_QUOTA_OUT = 3932160
@@ -30,7 +30,7 @@ WAN_QUOTA_IN = 3932160
 [core]
 USE_EPHEMERAL_KEYS = NO
-FORCESTART = YES
+IMMEDIATE_START = YES
 [transport-udp]
 TIMEOUT = 300 s
diff --git a/src/testbed/test_testbed_underlay.conf.in b/src/testbed/test_testbed_underlay.conf.in
index 5799b5253..1916cc59d 100644
--- a/src/testbed/test_testbed_underlay.conf.in
+++ b/src/testbed/test_testbed_underlay.conf.in
@@ -5,9 +5,9 @@ OVERLAY_TOPOLOGY = LINE
 OPERATION_TIMEOUT = 5 s
 [testbed-underlay]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 DBFILE = /will/be/overwritten/by/testcase
-FORCESTART = YES
+IMMEDIATE_START = YES
 [dv]
-AUTOSTART = NO
+START_ON_DEMAND = NO
diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in
index 86044fbfb..c1d64b324 100644
--- a/src/testbed/testbed.conf.in
+++ b/src/testbed/testbed.conf.in
@@ -1,5 +1,5 @@
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 @JAVAPORT@ PORT = 2101
 HOSTNAME = localhost
 BINARY = gnunet-service-testbed
@@ -90,7 +90,7 @@ SHARED_SERVICES =
 [testbed-barrier]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 @UNIXONLY@ PORT = 2103
 HOSTNAME = localhost
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed-barrier.sock
@@ -101,7 +101,7 @@ UNIX_MATCH_GID = YES
 # This section is related to configuring underlay restrictions to simulate
 # connectivity restrictions of NAT boxes
 [testbed-underlay]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 NOARMBIND = YES
 BINARY = gnunet-daemon-testbed-underlay
 # The sqlite3 database file containing information about what underlay
@@ -109,8 +109,8 @@ BINARY = gnunet-daemon-testbed-underlay
 # DBFILE =
 [latency-logger]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 NOARMBIND = YES
 BINARY = gnunet-daemon-latency-logger
 # The sqlite3 database file where the latency values are to be stored
-# DBFILE =
-\ No newline at end of file
+# DBFILE =
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c
index 51a8b979a..114055a07 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -1391,7 +1391,7 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
  }
  do
  {
-    secondary_option = va_arg (va, enum GNUNET_TESTBED_TopologyOption);
+    secondary_option = GNUNET_VA_ARG_ENUM (va, GNUNET_TESTBED_TopologyOption);
    switch (secondary_option)
    {
@@ -1552,7 +1552,7 @@ GNUNET_TESTBED_underlay_construct_ (int num_peers,
  tc.type = TOPOLOGYCONTEXT_TYPE_UNDERLAY;
  underlay = &tc.u.underlay;
  va_start (vargs, cls);
-  topology = va_arg (vargs, enum GNUNET_TESTBED_TopologyOption);
+  topology = GNUNET_VA_ARG_ENUM (vargs, GNUNET_TESTBED_TopologyOption);
  switch (topology)
  {
  case GNUNET_TESTBED_TOPOLOGY_LINE:
diff --git a/src/topology/topology.conf b/src/topology/topology.conf
index 2baf7ad38..45d8dd0c7 100644
--- a/src/topology/topology.conf
+++ b/src/topology/topology.conf
@@ -1,5 +1,5 @@
 [topology]
-FORCESTART = YES
+IMMEDIATE_START = YES
 NOARMBIND = YES
 MINIMUM-FRIENDS = 0
 FRIENDS-ONLY = NO
diff --git a/src/transport/test_transport_api_manipulation_cfg.c b/src/transport/test_transport_api_manipulation_cfg.c
index 4cab84066..350dc8eab 100644
--- a/src/transport/test_transport_api_manipulation_cfg.c
+++ b/src/transport/test_transport_api_manipulation_cfg.c
@@ -168,6 +168,7 @@ main (int argc,
  ccc = &my_ccc;
  sc.ccc = ccc;
+  start_request = GNUNET_TIME_absolute_get ();
  if (GNUNET_OK !=
      GNUNET_TRANSPORT_TESTING_main (2,
                                     &GNUNET_TRANSPORT_TESTING_connect_check,
diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in
index 1f56a2fa7..4185acc29 100644
--- a/src/transport/transport.conf.in
+++ b/src/transport/transport.conf.in
@@ -1,5 +1,5 @@
 [transport]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2091
 HOSTNAME = localhost
 BINARY = gnunet-service-transport
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 208cab07b..4296199db 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -199,6 +199,9 @@ gnunet_service_resolver_SOURCES = \
 gnunet_service_resolver_LDADD = \
  libgnunetutil.la \
  $(GN_LIBINTL)
+if HAVE_GETADDRINFO_A
+gnunet_service_resolver_LDADD += -lanl
+endif
 gnunet_resolver_SOURCES = \
diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index 85e17248b..f875d165d 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -626,6 +626,9 @@ parse_definitions (const char *constname, int force)
          to_line = INT_MAX;
        }
        break;
+      default:
+        fprintf(stderr, "ERROR: Unable to parse log defintion: Syntax error.\n");
+        break;
      }
      start = p + 1;
      state++;
@@ -652,6 +655,7 @@ parse_definitions (const char *constname, int force)
        start = p + 1;
        break;
      default:
+        fprintf(stderr, "ERROR: Unable to parse log defintion: Syntax error.\n");
        break;
      }
    default:
diff --git a/src/util/disk.c b/src/util/disk.c
index 31e8f12c6..e0227be70 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -830,6 +830,12 @@ GNUNET_DISK_directory_create_for_file (const char *filename)
    errno = EINVAL;
    return GNUNET_SYSERR;
  }
+  if (0 == ACCESS (rdir, W_OK))
+  {
+    GNUNET_free (rdir);
+    return GNUNET_OK;
+  }
  len = strlen (rdir);
  while ((len > 0) && (rdir[len] != DIR_SEPARATOR))
    len--;
@@ -1686,16 +1692,19 @@ GNUNET_DISK_file_open (const char *fn,
    return NULL;
  }
  if (flags & GNUNET_DISK_OPEN_FAILIFEXISTS)
-    oflags |= (O_CREAT | O_EXCL);
+      oflags |= (O_CREAT | O_EXCL);
  if (flags & GNUNET_DISK_OPEN_TRUNCATE)
    oflags |= O_TRUNC;
  if (flags & GNUNET_DISK_OPEN_APPEND)
    oflags |= O_APPEND;
-  if (flags & GNUNET_DISK_OPEN_CREATE)
+  if(GNUNET_NO == GNUNET_DISK_file_test(fn))
-  {
+   {
-    (void) GNUNET_DISK_directory_create_for_file (expfn);
+      if (flags & GNUNET_DISK_OPEN_CREATE )
-    oflags |= O_CREAT;
+        {
-    mode = translate_unix_perms (perm);
+          (void) GNUNET_DISK_directory_create_for_file (expfn);
+          oflags |= O_CREAT;
+          mode = translate_unix_perms (perm);
+        }
  }
  fd = open (expfn, oflags
diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c
index c55b22fb6..32cce65dd 100644
--- a/src/util/getopt_helpers.c
+++ b/src/util/getopt_helpers.c
@@ -748,6 +748,13 @@ set_uint (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
  unsigned int *val = scls;
  (void) ctx;
+  if('-' == *value)
+  {
+        FPRINTF (stderr,
+                _("Your input for the '%s' option has to be a non negative number \n"),
+                option);
+        return GNUNET_SYSERR;
+  }
  if (1 != SSCANF (value,
                   "%u",
                   val))
diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c
index d26ec659f..d90d8ec10 100644
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -84,6 +84,16 @@ static struct IPCache *cache_head;
 */
 static struct IPCache *cache_tail;
+/**
+ * Pipe for asynchronously notifying about resolve result
+ */
+static struct GNUNET_DISK_PipeHandle *resolve_result_pipe;
+/**
+ * Task for reading from resolve_result_pipe
+ */
+static struct GNUNET_SCHEDULER_Task *resolve_result_pipe_task;
 #if HAVE_GETNAMEINFO
 /**
@@ -223,14 +233,15 @@ notify_service_client_done (void *cls)
 static void
 get_ip_as_string (struct GNUNET_SERVICE_Client *client,
                  int af,
-                  const void *ip)
+                  const void *ip,
+                  uint32_t request_id)
 {
  struct IPCache *pos;
  struct IPCache *next;
  struct GNUNET_TIME_Absolute now;
  struct GNUNET_MQ_Envelope *env;
  struct GNUNET_MQ_Handle *mq;
-  struct GNUNET_MessageHeader *msg;
+  struct GNUNET_RESOLVER_ResponseMessage *msg;
  size_t ip_len;
  struct in6_addr ix;
  size_t alen;
@@ -304,13 +315,16 @@ get_ip_as_string (struct GNUNET_SERVICE_Client *client,
  env = GNUNET_MQ_msg_extra (msg,
                             alen,
                             GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+  msg->id = request_id;
  GNUNET_memcpy (&msg[1],
                 pos->addr,
                 alen);
  GNUNET_MQ_send (mq,
                  env);
+  // send end message
  env = GNUNET_MQ_msg (msg,
                       GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+  msg->id = request_id;
  GNUNET_MQ_notify_sent (env,
                         &notify_service_client_done,
                         client);
@@ -319,17 +333,152 @@ get_ip_as_string (struct GNUNET_SERVICE_Client *client,
 }
-#if HAVE_GETADDRINFO
+#if HAVE_GETADDRINFO_A
+struct AsyncCls
+{
+  struct gaicb *host;
+  struct sigevent *sig;
+  struct GNUNET_MQ_Handle *mq;
+  uint32_t request_id;
+};
+static void
+resolve_result_pipe_cb (void *cls)
+{
+  struct AsyncCls *async_cls;
+  struct gaicb *host;
+  struct GNUNET_RESOLVER_ResponseMessage *msg;
+  struct GNUNET_MQ_Envelope *env;
+  GNUNET_DISK_file_read (GNUNET_DISK_pipe_handle (resolve_result_pipe,
+                                                  GNUNET_DISK_PIPE_END_READ),
+                         &async_cls,
+                         sizeof (struct AsyncCls *));
+  resolve_result_pipe_task =
+    GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+                                    GNUNET_DISK_pipe_handle (resolve_result_pipe,
+                                                             GNUNET_DISK_PIPE_END_READ),
+                                    &resolve_result_pipe_cb,
+                                    NULL);
+  host = async_cls->host;
+  for (struct addrinfo *pos = host->ar_result; pos != NULL; pos = pos->ai_next)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Lookup result for hostname %s: %s (request ID %u)\n",
+                host->ar_name,
+                GNUNET_a2s (pos->ai_addr, pos->ai_addrlen),
+                async_cls->request_id);
+    switch (pos->ai_family)
+    {
+    case AF_INET:
+      env = GNUNET_MQ_msg_extra (msg,
+                                 sizeof (struct in_addr),
+                                 GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+      msg->id = async_cls->request_id;
+      GNUNET_memcpy (&msg[1],
+                     &((struct sockaddr_in*) pos->ai_addr)->sin_addr,
+                     sizeof (struct in_addr));
+      GNUNET_MQ_send (async_cls->mq,
+                      env);
+      break;
+    case AF_INET6:
+      env = GNUNET_MQ_msg_extra (msg,
+                                 sizeof (struct in6_addr),
+                                 GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+      msg->id = async_cls->request_id;
+      GNUNET_memcpy (&msg[1],
+                     &((struct sockaddr_in6*) pos->ai_addr)->sin6_addr,
+                     sizeof (struct in6_addr));
+      GNUNET_MQ_send (async_cls->mq,
+                      env);
+      break;
+    default:
+      /* unsupported, skip */
+      break;
+    }
+  }
+  // send end message
+  env = GNUNET_MQ_msg (msg,
+                       GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+  msg->id = async_cls->request_id;
+  GNUNET_MQ_send (async_cls->mq,
+                  env);
+  freeaddrinfo (host->ar_result);
+  GNUNET_free ((struct gaicb *)host->ar_request); // free hints
+  GNUNET_free (host);
+  GNUNET_free (async_cls->sig);
+  GNUNET_free (async_cls);
+}
+static void
+handle_async_result (union sigval val) 
+{
+  GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle (resolve_result_pipe,
+                                                   GNUNET_DISK_PIPE_END_WRITE),
+                          &val.sival_ptr,
+                          sizeof (val.sival_ptr));
+}
+static int
+getaddrinfo_a_resolve (struct GNUNET_MQ_Handle *mq,
+                       const char *hostname,
+                       int af,
+                       uint32_t request_id)
+{
+  int ret;
+  struct gaicb *host;
+  struct addrinfo *hints; 
+  struct sigevent *sig;
+  struct AsyncCls *async_cls;
+  host = GNUNET_new (struct gaicb);
+  hints = GNUNET_new (struct addrinfo);
+  sig = GNUNET_new (struct sigevent);
+  async_cls = GNUNET_new (struct AsyncCls);
+  memset (hints,
+          0,
+          sizeof (struct addrinfo));
+  memset (sig,
+          0,
+          sizeof (struct sigevent));
+  hints->ai_family = af;
+  hints->ai_socktype = SOCK_STREAM;      /* go for TCP */
+  host->ar_name = hostname;
+  host->ar_service = NULL;
+  host->ar_request = hints;
+  host->ar_result = NULL;
+  sig->sigev_notify = SIGEV_THREAD;
+  sig->sigev_value.sival_ptr = async_cls;
+  sig->sigev_notify_function = &handle_async_result; 
+  async_cls->host = host;
+  async_cls->sig = sig;
+  async_cls->mq = mq;
+  async_cls->request_id = request_id;
+  ret = getaddrinfo_a (GAI_NOWAIT,
+                       &host,
+                       1,
+                       sig);
+  if (0 != ret)
+    return GNUNET_SYSERR;
+  return GNUNET_OK;
+}
+#elif HAVE_GETADDRINFO
 static int
 getaddrinfo_resolve (struct GNUNET_MQ_Handle *mq,
                     const char *hostname,
-                     int af)
+                     int af,
+                     uint32_t request_id)
 {
  int s;
  struct addrinfo hints;
  struct addrinfo *result;
  struct addrinfo *pos;
-  struct GNUNET_MessageHeader *msg;
+  struct GNUNET_RESOLVER_ResponseMessage *msg;
  struct GNUNET_MQ_Envelope *env;
 #ifdef WINDOWS
@@ -340,10 +489,12 @@ getaddrinfo_resolve (struct GNUNET_MQ_Handle *mq,
    int ret2;
    ret1 = getaddrinfo_resolve (mq,
                                hostname,
-                                AF_INET);
+                                AF_INET,
+                                request_id);
    ret2 = getaddrinfo_resolve (mq,
                                hostname,
-                                AF_INET6);
+                                AF_INET6,
+                                request_id);
    if ( (ret1 == GNUNET_OK) ||
         (ret2 == GNUNET_OK) )
      return GNUNET_OK;
@@ -389,6 +540,7 @@ getaddrinfo_resolve (struct GNUNET_MQ_Handle *mq,
      env = GNUNET_MQ_msg_extra (msg,
                                 sizeof (struct in_addr),
                                 GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+      msg->id = request_id;
      GNUNET_memcpy (&msg[1],
                     &((struct sockaddr_in*) pos->ai_addr)->sin_addr,
                     sizeof (struct in_addr));
@@ -399,6 +551,7 @@ getaddrinfo_resolve (struct GNUNET_MQ_Handle *mq,
      env = GNUNET_MQ_msg_extra (msg,
                                 sizeof (struct in6_addr),
                                 GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+      msg->id = request_id;
      GNUNET_memcpy (&msg[1],
                     &((struct sockaddr_in6*) pos->ai_addr)->sin6_addr,
                     sizeof (struct in6_addr));
@@ -421,13 +574,14 @@ getaddrinfo_resolve (struct GNUNET_MQ_Handle *mq,
 static int
 gethostbyname2_resolve (struct GNUNET_MQ_Handle *mq,
                        const char *hostname,
-                        int af)
+                        int af,
+                        uint32_t request_id)
 {
  struct hostent *hp;
  int ret1;
  int ret2;
  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_MessageHeader *msg;
+  struct GNUNET_RESOLVER_ResponseMessage *msg;
 #ifdef WINDOWS
  /* gethostbyname2() in plibc is a compat dummy that calls gethostbyname(). */
@@ -438,10 +592,12 @@ gethostbyname2_resolve (struct GNUNET_MQ_Handle *mq,
  {
    ret1 = gethostbyname2_resolve (mq,
                                   hostname,
-                                   AF_INET);
+                                   AF_INET,
+                                   request_id);
    ret2 = gethostbyname2_resolve (mq,
                                   hostname,
-                                   AF_INET6);
+                                   AF_INET6,
+                                   request_id);
    if ( (ret1 == GNUNET_OK) ||
         (ret2 == GNUNET_OK) )
      return GNUNET_OK;
@@ -468,6 +624,7 @@ gethostbyname2_resolve (struct GNUNET_MQ_Handle *mq,
    env = GNUNET_MQ_msg_extra (msg,
                               hp->h_length,
                               GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+    msg->id = request_id;
    GNUNET_memcpy (&msg[1],
                   hp->h_addr_list[0],
                   hp->h_length);
@@ -479,6 +636,7 @@ gethostbyname2_resolve (struct GNUNET_MQ_Handle *mq,
    env = GNUNET_MQ_msg_extra (msg,
                               hp->h_length,
                               GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+    msg->id = request_id;
    GNUNET_memcpy (&msg[1],
                   hp->h_addr_list[0],
                   hp->h_length);
@@ -497,10 +655,11 @@ gethostbyname2_resolve (struct GNUNET_MQ_Handle *mq,
 static int
 gethostbyname_resolve (struct GNUNET_MQ_Handle *mq,
-                       const char *hostname)
+                       const char *hostname,
+                       uint32_t request_id)
 {
  struct hostent *hp;
-  struct GNUNET_MessageHeader *msg;
+  struct GNUNET_RESOLVER_ResponseMessage *msg;
  struct GNUNET_MQ_Envelope *env;
  hp = GETHOSTBYNAME (hostname);
@@ -521,6 +680,7 @@ gethostbyname_resolve (struct GNUNET_MQ_Handle *mq,
  env = GNUNET_MQ_msg_extra (msg,
                             hp->h_length,
                             GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+  msg->id = request_id;
  GNUNET_memcpy (&msg[1],
                 hp->h_addr_list[0],
                 hp->h_length);
@@ -541,34 +701,42 @@ gethostbyname_resolve (struct GNUNET_MQ_Handle *mq,
 static void
 get_ip_from_hostname (struct GNUNET_SERVICE_Client *client,
                      const char *hostname,
-                      int af)
+                      int af,
+                      uint32_t request_id)
 {
-  int ret;
-  struct GNUNET_MQ_Handle *mq;
  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_MessageHeader *msg;
+  struct GNUNET_RESOLVER_ResponseMessage *msg;
+  struct GNUNET_MQ_Handle *mq;
  mq = GNUNET_SERVICE_client_get_mq (client);
-  ret = GNUNET_NO;
+#if HAVE_GETADDRINFO_A
-#if HAVE_GETADDRINFO
+  getaddrinfo_a_resolve (mq,
-  if (ret == GNUNET_NO)
+                         hostname,
-    ret = getaddrinfo_resolve (mq,
+                         af,
-                               hostname,
+                         request_id);
-                               af);
+  GNUNET_SERVICE_client_continue (client);
+  return;
+#elif HAVE_GETADDRINFO
+  getaddrinfo_resolve (mq,
+                       hostname,
+                       af,
+                       request_id);
 #elif HAVE_GETHOSTBYNAME2
-  if (ret == GNUNET_NO)
+  gethostbyname2_resolve (mq,
-    ret = gethostbyname2_resolve (mq,
+                          hostname,
-                                  hostname,
+                          af,
-                                  af);
+                          request_id);
 #elif HAVE_GETHOSTBYNAME
-  if ( (ret == GNUNET_NO) &&
+  if ( ( (af == AF_UNSPEC) ||
-       ( (af == AF_UNSPEC) ||
         (af == PF_INET) ) )
    gethostbyname_resolve (mq,
-                           hostname);
+                           hostname,
+                           request_id);
 #endif
+  // send end message
  env = GNUNET_MQ_msg (msg,
                       GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+  msg->id = request_id;
  GNUNET_MQ_notify_sent (env,
                         &notify_service_client_done,
                         client);
@@ -647,21 +815,21 @@ handle_get (void *cls,
  const void *ip;
  int direction;
  int af;
+  uint32_t id;
  direction = ntohl (msg->direction);
  af = ntohl (msg->af);
+  id = ntohl (msg->id);
  if (GNUNET_NO == direction)
  {
    /* IP from hostname */
    const char *hostname;
    hostname = (const char *) &msg[1];
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Resolver asked to look up `%s'.\n",
-                hostname);
    get_ip_from_hostname (client,
                          hostname,
-                          af);
+                          af,
+                          id);
    return;
  }
  ip = &msg[1];
@@ -671,16 +839,18 @@ handle_get (void *cls,
    char buf[INET6_ADDRSTRLEN];
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Resolver asked to look up IP address `%s'.\n",
+                "Resolver asked to look up IP address `%s (request ID %u)'.\n",
                inet_ntop (af,
                           ip,
                           buf,
-                           sizeof (buf)));
+                           sizeof (buf)),
+                id);
  }
 #endif
  get_ip_as_string (client,
                    af,
-                    ip);
+                    ip,
+                    id);
 }
@@ -700,6 +870,19 @@ connect_cb (void *cls,
  (void) cls;
  (void) mq;
+#if HAVE_GETADDRINFO_A
+  resolve_result_pipe = GNUNET_DISK_pipe (GNUNET_NO,
+                                          GNUNET_NO,
+                                          GNUNET_NO,
+                                          GNUNET_NO);
+  GNUNET_assert (NULL != resolve_result_pipe);
+  resolve_result_pipe_task =
+    GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+                                    GNUNET_DISK_pipe_handle (resolve_result_pipe,
+                                                             GNUNET_DISK_PIPE_END_READ),
+                                    &resolve_result_pipe_cb,
+                                    NULL);
+#endif
  return c;
 }
@@ -718,6 +901,18 @@ disconnect_cb (void *cls,
 {
  (void) cls;
+#if HAVE_GETADDRINFO_A
+  if (NULL != resolve_result_pipe_task)
+  {
+    GNUNET_SCHEDULER_cancel (resolve_result_pipe_task);
+    resolve_result_pipe_task = NULL;
+  }
+  if (NULL != resolve_result_pipe)
+  {
+    GNUNET_DISK_pipe_close (resolve_result_pipe);
+    resolve_result_pipe = NULL;
+  }
+#endif
  GNUNET_assert (c == internal_cls);
 }
diff --git a/src/util/resolver.conf.in b/src/util/resolver.conf.in
index 9c5df32bc..6e2b9a869 100644
--- a/src/util/resolver.conf.in
+++ b/src/util/resolver.conf.in
@@ -1,5 +1,5 @@
 [resolver]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2089
 HOSTNAME = localhost
 BINARY = gnunet-service-resolver
diff --git a/src/util/resolver.h b/src/util/resolver.h
index 0b137f085..a0f105afa 100644
--- a/src/util/resolver.h
+++ b/src/util/resolver.h
@@ -56,10 +56,37 @@ struct GNUNET_RESOLVER_GetMessage
   */
  int32_t af GNUNET_PACKED;
+  /**
+   * identifies the request and is contained in the response message. The
+   * client has to match response to request by this identifier.
+   */
+  uint32_t id GNUNET_PACKED;
  /* followed by 0-terminated string for A/AAAA-lookup or
     by 'struct in_addr' / 'struct in6_addr' for reverse lookup */
 };
+struct GNUNET_RESOLVER_ResponseMessage
+{
+  /**
+   * Type: GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE
+   */
+  struct GNUNET_MessageHeader header;
+  /**
+  * identifies the request this message responds to. The client
+  * has to match response to request by this identifier.
+  */
+  uint32_t id GNUNET_PACKED;
+  /* followed by 0-terminated string for response to a reverse lookup
+   * or by 'struct in_addr' / 'struct in6_addr' for response to
+   * A/AAAA-lookup
+   */
+};
 GNUNET_NETWORK_STRUCT_END
 #endif
diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index b2e6a4986..b94819f06 100644
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -69,6 +69,11 @@ static struct GNUNET_RESOLVER_RequestHandle *req_head;
 static struct GNUNET_RESOLVER_RequestHandle *req_tail;
 /**
+ * ID of the last request we sent to the service
+ */
+static uint32_t last_request_id;
+/**
 * How long should we wait to reconnect?
 */
 static struct GNUNET_TIME_Relative backoff;
@@ -137,6 +142,11 @@ struct GNUNET_RESOLVER_RequestHandle
  int af;
  /**
+   * Identifies the request. The response will contain this id.
+   */
+  uint32_t id;
+  /**
   * Has this request been transmitted to the service?
   * #GNUNET_YES if transmitted
   * #GNUNET_YES if not transmitted
@@ -180,6 +190,11 @@ check_config ()
  struct sockaddr_in v4;
  struct sockaddr_in6 v6;
+  if (GNUNET_OK ==
+      GNUNET_CONFIGURATION_have_value (resolver_cfg,
+                                       "resolver",
+                                       "UNIXPATH"))
+    return GNUNET_OK;
  memset (&v4, 0, sizeof (v4));
  v4.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
  v4.sin_family = AF_INET;
@@ -430,11 +445,13 @@ process_requests ()
                             GNUNET_MESSAGE_TYPE_RESOLVER_REQUEST);
  msg->direction = htonl (rh->direction);
  msg->af = htonl (rh->af);
+  msg->id = htonl (rh->id);
  GNUNET_memcpy (&msg[1],
                 &rh[1],
                 rh->data_len);
  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Transmitting DNS resolution request to DNS service\n");
+       "Transmitting DNS resolution request (ID %u) to DNS service\n",
+       rh->id);
  GNUNET_MQ_send (mq,
                  env);
  rh->was_transmitted = GNUNET_YES;
@@ -449,7 +466,7 @@ process_requests ()
 */
 static int
 check_response (void *cls,
-                const struct GNUNET_MessageHeader *msg)
+                const struct GNUNET_RESOLVER_ResponseMessage *msg)
 {
  (void) cls;
  (void) msg;
@@ -469,11 +486,18 @@ check_response (void *cls,
 */
 static void
 handle_response (void *cls,
-                 const struct GNUNET_MessageHeader *msg)
+                 const struct GNUNET_RESOLVER_ResponseMessage *msg)
 {
  struct GNUNET_RESOLVER_RequestHandle *rh = req_head;
  uint16_t size;
  char *nret;
+  uint32_t request_id = msg->id;
+  for (; rh != NULL; rh = rh->next)
+  {
+    if (rh->id == request_id)
+      break;
+  }
  (void) cls;
  if (NULL == rh)
@@ -485,8 +509,8 @@ handle_response (void *cls,
    reconnect ();
    return;
  }
-  size = ntohs (msg->size);
+  size = ntohs (msg->header.size);
-  if (size == sizeof (struct GNUNET_MessageHeader))
+  if (size == sizeof (struct GNUNET_RESOLVER_ResponseMessage))
  {
    LOG (GNUNET_ERROR_TYPE_DEBUG,
         "Received empty response from DNS service\n");
@@ -527,7 +551,7 @@ handle_response (void *cls,
    const char *hostname;
    hostname = (const char *) &msg[1];
-    if (hostname[size - sizeof (struct GNUNET_MessageHeader) - 1] != '\0')
+    if (hostname[size - sizeof (struct GNUNET_RESOLVER_ResponseMessage) - 1] != '\0')
    {
      GNUNET_break (0);
      if (GNUNET_SYSERR != rh->was_transmitted)
@@ -561,7 +585,7 @@ handle_response (void *cls,
    size_t ip_len;
    ip = &msg[1];
-    ip_len = size - sizeof (struct GNUNET_MessageHeader);
+    ip_len = size - sizeof (struct GNUNET_RESOLVER_ResponseMessage);
    if (ip_len == sizeof (struct in_addr))
    {
      memset (&v4, 0, sizeof (v4));
@@ -758,7 +782,7 @@ reconnect_task (void *cls)
  struct GNUNET_MQ_MessageHandler handlers[] = {
    GNUNET_MQ_hd_var_size (response,
                           GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE,
-                           struct GNUNET_MessageHeader,
+                           struct GNUNET_RESOLVER_ResponseMessage,
                           NULL),
    GNUNET_MQ_handler_end ()
  };
@@ -921,6 +945,7 @@ GNUNET_RESOLVER_ip_get (const char *hostname,
       hostname);
  rh = GNUNET_malloc (sizeof (struct GNUNET_RESOLVER_RequestHandle) + slen);
  rh->af = af;
+  rh->id = ++last_request_id;
  rh->addr_callback = callback;
  rh->cls = callback_cls;
  GNUNET_memcpy (&rh[1],
@@ -1067,6 +1092,7 @@ GNUNET_RESOLVER_hostname_get (const struct sockaddr *sa,
  rh->name_callback = callback;
  rh->cls = cls;
  rh->af = sa->sa_family;
+  rh->id = ++last_request_id;
  rh->timeout = GNUNET_TIME_relative_to_absolute (timeout);
  GNUNET_memcpy (&rh[1],
                 ip,
diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c
index c89fad865..5a8f95093 100644
--- a/src/util/test_resolver_api.c
+++ b/src/util/test_resolver_api.c
@@ -258,6 +258,8 @@ run (void *cls, char *const *args, const char *cfgfile,
  /* Resolve the same using GNUNET */
  GNUNET_RESOLVER_ip_get (ROOTSERVER_NAME, AF_INET, timeout,
                          &check_rootserver_ip, cls);
+  GNUNET_RESOLVER_ip_get (ROOTSERVER_NAME, AF_INET, timeout,
+                          &check_rootserver_ip, cls);
  /*
   * Success: forward lookups work as expected
diff --git a/src/util/util.conf b/src/util/util.conf
index f2e5bee28..dbc2b2e0d 100644
--- a/src/util/util.conf
+++ b/src/util/util.conf
@@ -25,7 +25,7 @@ GNUNET_CACHE_HOME = ${XDG_CACHE_HOME:-$GNUNET_HOME/.cache}/gnunet/
 # Runtime data (i.e UNIX domain sockets, locks, always lost on system boot)
 # This is the variable for system-wide services; use GNUNET_USER_RUNTIME_DIR
-# for per-user services (where USER_SERVICE=YES is set)
+# for per-user services (where RUN_PER_USER=YES is set)
 # Note that the 'gnunet'/system user must have $TMPDIR/$TMP set to
 # exactly the same values as 'normal' users, otherwise this will fail.
 # If $TMPDIR or $TMP are set to different directories for different
diff --git a/src/vpn/vpn.conf.in b/src/vpn/vpn.conf.in
index 585131554..c0f4c59ed 100644
--- a/src/vpn/vpn.conf.in
+++ b/src/vpn/vpn.conf.in
@@ -1,5 +1,5 @@
 [vpn]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @UNIXONLY@ PORT = 2105
 HOSTNAME = localhost
 BINARY = gnunet-service-vpn
diff --git a/src/zonemaster/zonemaster.conf.in b/src/zonemaster/zonemaster.conf.in
index 6179b87be..58cfcb7ce 100644
--- a/src/zonemaster/zonemaster.conf.in
+++ b/src/zonemaster/zonemaster.conf.in
@@ -1,6 +1,6 @@
 [zonemaster]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
-FORCESTART = YES
+IMMEDIATE_START = YES
 HOSTNAME = localhost
 BINARY = gnunet-service-zonemaster
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-zonemaster.sock
@@ -27,8 +27,8 @@ ZONE_PUBLISH_TIME_WINDOW = 4 h
 [zonemaster-monitor]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
-FORCESTART = YES
+IMMEDIATE_START = YES
 HOSTNAME = localhost
 BINARY = gnunet-service-zonemaster-monitor
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-zonemaster-monitor.sock