Merged run-launch-cleanup into trunk