diff --git a/sumo/tests/sumo/cf_model/collisions/pileup/errors.sumo b/sumo/tests/sumo/cf_model/collisions/pileup/errors.sumo
index c2f945077119..ca0d53155139 100644
--- a/sumo/tests/sumo/cf_model/collisions/pileup/errors.sumo
+++ b/sumo/tests/sumo/cf_model/collisions/pileup/errors.sumo
@@ -1,4 +1,23 @@
-Warning: Value of tau=0.50 in car following model 'carFollowing-Krauss' lower than simulation step size may cause collisions
-Warning: Value of tau=0.50 in car following model 'carFollowing-Krauss' lower than simulation step size may cause collisions
-Warning: Teleporting vehicle 'follower'; collision with vehicle 'leader', lane='middle_0', gap=-3.92, time=40.00 stage=move.
-Warning: Vehicle 'follower' teleports beyond arrival edge 'middle', time 40.00.
+Warning: Value of tau=0.5 in car following model 'carFollowing-Krauss' lower than simulation step size may cause collisions
+Warning: Value of tau=0.5 in car following model 'carFollowing-Krauss' lower than simulation step size may cause collisions
+Warning: Vehicle 'follower.0'; collision with vehicle 'leader', lane='middle_0', gap=-3.91, time=40.00 stage=move.
+Warning: Vehicle 'follower.1'; collision with vehicle 'follower.0', lane='middle_0', gap=-8.14, time=41.00 stage=move.
+Warning: Vehicle 'follower.2'; collision with vehicle 'follower.1', lane='middle_0', gap=-6.39, time=41.00 stage=laneChange.
+Warning: Vehicle 'follower.3'; collision with vehicle 'follower.2', lane='middle_0', gap=-14.26, time=42.00 stage=move.
+Warning: Vehicle 'follower.4'; collision with vehicle 'follower.3', lane='middle_0', gap=-4.47, time=42.00 stage=laneChange.
+Warning: Vehicle 'follower.5'; collision with vehicle 'follower.4', lane='middle_0', gap=-0.61, time=43.00 stage=move.
+Warning: Teleporting vehicle 'leader' after earlier collision, lane='middle_0, time=51.00.
+Warning: Vehicle 'leader' teleports beyond arrival edge 'middle', time 51.00.
+Warning: Vehicle 'leader' aborts stop.
+Warning: Teleporting vehicle 'follower.0' after earlier collision, lane='middle_0, time=51.00.
+Warning: Vehicle 'follower.0' teleports beyond arrival edge 'middle', time 51.00.
+Warning: Teleporting vehicle 'follower.1' after earlier collision, lane='middle_0, time=52.00.
+Warning: Vehicle 'follower.1' teleports beyond arrival edge 'middle', time 52.00.
+Warning: Teleporting vehicle 'follower.2' after earlier collision, lane='middle_0, time=52.00.
+Warning: Vehicle 'follower.2' teleports beyond arrival edge 'middle', time 52.00.
+Warning: Teleporting vehicle 'follower.3' after earlier collision, lane='middle_0, time=53.00.
+Warning: Vehicle 'follower.3' teleports beyond arrival edge 'middle', time 53.00.
+Warning: Teleporting vehicle 'follower.4' after earlier collision, lane='middle_0, time=53.00.
+Warning: Vehicle 'follower.4' teleports beyond arrival edge 'middle', time 53.00.
+Warning: Teleporting vehicle 'follower.5' after earlier collision, lane='middle_0, time=54.00.
+Warning: Vehicle 'follower.5' teleports beyond arrival edge 'middle', time 54.00.
diff --git a/sumo/tests/sumo/cf_model/collisions/pileup/detector.sumo b/sumo/tests/sumo/cf_model/collisions/pileup_warn/detector.sumo.ballistic
similarity index 64%
rename from sumo/tests/sumo/cf_model/collisions/pileup/detector.sumo
rename to sumo/tests/sumo/cf_model/collisions/pileup_warn/detector.sumo.ballistic
index 1202b8a1d6c2..d655f60fc303 100644
--- a/sumo/tests/sumo/cf_model/collisions/pileup/detector.sumo
+++ b/sumo/tests/sumo/cf_model/collisions/pileup_warn/detector.sumo.ballistic
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/14/16 16:07:37 by SUMO Version dev-SVN-r21978
+<!-- generated on Wed Feb  1 11:29:12 2017 by SUMO Version dev-SVN-r21650
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
@@ -19,6 +19,10 @@
         <step-length value="1.0"/>
     </time>
 
+    <processing>
+        <step-method.ballistic value="true"/>
+    </processing>
+
     <report>
         <xml-validation value="never"/>
         <duration-log.disable value="true"/>
@@ -29,9 +33,8 @@
 -->
 
 <instantE1 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/instant_e1_file.xsd">
-    <instantOut id="beg_end" time="23.11" state="enter" vehID="leader" speed="20.00" length="5.00" type="leader"/>
-    <instantOut id="beg_end" time="23.36" state="leave" vehID="leader" speed="20.00" length="5.00" type="leader" occupancy="0.25"/>
-    <instantOut id="beg_end" time="23.90" state="enter" vehID="follower" speed="20.24" length="5.00" type="follower" gap="0.54"/>
-    <instantOut id="beg_end" time="24.00" state="stay" vehID="follower" speed="20.24" length="5.00" type="follower"/>
-    <instantOut id="beg_end" time="24.15" state="leave" vehID="follower" speed="20.18" length="5.00" type="follower" occupancy="0.25"/>
+    <instantOut id="beg_end" time="23.61" state="enter" vehID="leader" speed="20.00" length="5.00" type="leader"/>
+    <instantOut id="beg_end" time="23.86" state="leave" vehID="leader" speed="20.00" length="5.00" type="leader" occupancy="0.25"/>
+    <instantOut id="beg_end" time="24.42" state="enter" vehID="follower" speed="20.48" length="5.00" type="follower" gap="0.57"/>
+    <instantOut id="beg_end" time="24.67" state="leave" vehID="follower" speed="19.14" length="5.00" type="follower" occupancy="0.25"/>
 </instantE1>
diff --git a/sumo/tests/sumo/cf_model/collisions/pileup_warn/errors.sumo b/sumo/tests/sumo/cf_model/collisions/pileup_warn/errors.sumo
new file mode 100644
index 000000000000..241c359fddda
--- /dev/null
+++ b/sumo/tests/sumo/cf_model/collisions/pileup_warn/errors.sumo
@@ -0,0 +1,8 @@
+Warning: Value of tau=0.5 in car following model 'carFollowing-Krauss' lower than simulation step size may cause collisions
+Warning: Value of tau=0.5 in car following model 'carFollowing-Krauss' lower than simulation step size may cause collisions
+Warning: Vehicle 'follower.0'; collision with vehicle 'leader', lane='middle_0', gap=-3.91, time=40.00 stage=move.
+Warning: Vehicle 'follower.1'; collision with vehicle 'follower.0', lane='middle_0', gap=-8.14, time=41.00 stage=move.
+Warning: Vehicle 'follower.2'; collision with vehicle 'follower.1', lane='middle_0', gap=-6.39, time=41.00 stage=laneChange.
+Warning: Vehicle 'follower.3'; collision with vehicle 'follower.2', lane='middle_0', gap=-14.26, time=42.00 stage=move.
+Warning: Vehicle 'follower.4'; collision with vehicle 'follower.3', lane='middle_0', gap=-4.47, time=42.00 stage=laneChange.
+Warning: Vehicle 'follower.5'; collision with vehicle 'follower.4', lane='middle_0', gap=-0.61, time=43.00 stage=move.
diff --git a/sumo/tests/sumo/cf_model/collisions/pileup_warn/errors.sumo.ballistic b/sumo/tests/sumo/cf_model/collisions/pileup_warn/errors.sumo.ballistic
new file mode 100644
index 000000000000..b5b2450deec3
--- /dev/null
+++ b/sumo/tests/sumo/cf_model/collisions/pileup_warn/errors.sumo.ballistic
@@ -0,0 +1,4 @@
+Warning: Value of tau=0.50 in car following model 'carFollowing-Krauss' lower than simulation step size may cause collisions
+Warning: Value of tau=0.50 in car following model 'carFollowing-Krauss' lower than simulation step size may cause collisions
+Warning: Teleporting vehicle 'follower'; collision with vehicle 'leader', lane='middle_0', gap=-2.42, time=41.00 stage=move.
+Warning: Vehicle 'follower' teleports beyond arrival edge 'middle', time 41.00.
diff --git a/sumo/tests/sumo/cf_model/collisions/pileup_warn/errors.sumo.sublanes b/sumo/tests/sumo/cf_model/collisions/pileup_warn/errors.sumo.sublanes
new file mode 100644
index 000000000000..a41298f7a954
--- /dev/null
+++ b/sumo/tests/sumo/cf_model/collisions/pileup_warn/errors.sumo.sublanes
@@ -0,0 +1,4 @@
+Warning: Value of tau=0.50 in car following model 'carFollowing-Krauss' lower than simulation step size may cause collisions
+Warning: Value of tau=0.50 in car following model 'carFollowing-Krauss' lower than simulation step size may cause collisions
+Warning: Teleporting vehicle 'follower'; collision with vehicle 'leader', lane='middle_0', gap=-3.92', latGap=-1.80, time=40.00 stage=move.
+Warning: Vehicle 'follower' teleports beyond arrival edge 'middle', time 40.00.
diff --git a/sumo/tests/sumo/cf_model/collisions/pileup_warn/input_routes.rou.xml b/sumo/tests/sumo/cf_model/collisions/pileup_warn/input_routes.rou.xml
new file mode 100644
index 000000000000..645e8e8902a8
--- /dev/null
+++ b/sumo/tests/sumo/cf_model/collisions/pileup_warn/input_routes.rou.xml
@@ -0,0 +1,12 @@
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+
+    <!-- allow follower to catch up to leader-->
+    <vType id="leader"   tau="0.5" sigma="0" maxSpeed="20" minGap="0"/>
+    <vType id="follower" tau="0.5" sigma="0" maxSpeed="40" minGap="0"/>
+
+    <route id="r1" edges="beg middle"/>
+    <vehicle id="leader"   type="leader"   depart="0" route="r1">
+        <stop lane="middle_0" duration="0" endPos="200"/>
+    </vehicle>
+    <flow id="follower" type="follower" begin="2" end="8" period="1" departPos="last" route="r1"/>
+</routes>
diff --git a/sumo/tests/sumo/cf_model/collisions/pileup_warn/options.sumo b/sumo/tests/sumo/cf_model/collisions/pileup_warn/options.sumo
new file mode 100644
index 000000000000..1958abc3712d
--- /dev/null
+++ b/sumo/tests/sumo/cf_model/collisions/pileup_warn/options.sumo
@@ -0,0 +1,3 @@
+--no-step-log --no-duration-log --net-file=three_split.net.xml -r
+input_routes.rou.xml --collision.stoptime 10
+--collision.action warn
diff --git a/sumo/tests/sumo/cf_model/collisions/pileup_warn/output.sumo b/sumo/tests/sumo/cf_model/collisions/pileup_warn/output.sumo
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/sumo/tests/sumo/cf_model/collisions/pileup/rawdump.sumo b/sumo/tests/sumo/cf_model/collisions/pileup_warn/rawdump.sumo.ballistic
similarity index 60%
rename from sumo/tests/sumo/cf_model/collisions/pileup/rawdump.sumo
rename to sumo/tests/sumo/cf_model/collisions/pileup_warn/rawdump.sumo.ballistic
index 27b1b1836f34..ccd9d9c9e4d7 100644
--- a/sumo/tests/sumo/cf_model/collisions/pileup/rawdump.sumo
+++ b/sumo/tests/sumo/cf_model/collisions/pileup_warn/rawdump.sumo.ballistic
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 05/20/16 14:20:48 by SUMO Version dev-SVN-r20765
+<!-- generated on Mon Sep 19 21:56:04 2016 by SUMO Version dev-SVN-r21424
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
@@ -19,6 +19,10 @@
         <step-length value="1.0"/>
     </time>
 
+    <processing>
+        <step-method.ballistic value="true"/>
+    </processing>
+
     <report>
         <xml-validation value="never"/>
         <duration-log.disable value="true"/>
@@ -39,7 +43,7 @@
     <timestep time="1.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="leader" pos="7.70" speed="2.60"/>
+                <vehicle id="leader" pos="6.40" speed="2.60"/>
             </lane>
         </edge>
     </timestep>
@@ -47,641 +51,667 @@
         <edge id="beg">
             <lane id="beg_0">
                 <vehicle id="follower" pos="5.10" speed="0.00"/>
-                <vehicle id="leader" pos="12.90" speed="5.20"/>
+                <vehicle id="leader" pos="10.30" speed="5.20"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="3.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="7.70" speed="2.60"/>
-                <vehicle id="leader" pos="20.70" speed="7.80"/>
+                <vehicle id="follower" pos="6.40" speed="2.60"/>
+                <vehicle id="leader" pos="16.80" speed="7.80"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="4.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="12.90" speed="5.20"/>
-                <vehicle id="leader" pos="31.10" speed="10.40"/>
+                <vehicle id="follower" pos="10.30" speed="5.20"/>
+                <vehicle id="leader" pos="25.90" speed="10.40"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="5.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="20.70" speed="7.80"/>
-                <vehicle id="leader" pos="44.10" speed="13.00"/>
+                <vehicle id="follower" pos="16.80" speed="7.80"/>
+                <vehicle id="leader" pos="37.60" speed="13.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="6.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="31.10" speed="10.40"/>
-                <vehicle id="leader" pos="59.70" speed="15.60"/>
+                <vehicle id="follower" pos="25.90" speed="10.40"/>
+                <vehicle id="leader" pos="51.90" speed="15.60"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="7.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="44.10" speed="13.00"/>
-                <vehicle id="leader" pos="77.90" speed="18.20"/>
+                <vehicle id="follower" pos="37.60" speed="13.00"/>
+                <vehicle id="leader" pos="68.80" speed="18.20"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="8.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="59.70" speed="15.60"/>
-                <vehicle id="leader" pos="97.90" speed="20.00"/>
+                <vehicle id="follower" pos="51.90" speed="15.60"/>
+                <vehicle id="leader" pos="87.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="9.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="77.90" speed="18.20"/>
-                <vehicle id="leader" pos="117.90" speed="20.00"/>
+                <vehicle id="follower" pos="68.80" speed="18.20"/>
+                <vehicle id="leader" pos="107.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="10.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="98.70" speed="20.80"/>
-                <vehicle id="leader" pos="137.90" speed="20.00"/>
+                <vehicle id="follower" pos="88.30" speed="20.80"/>
+                <vehicle id="leader" pos="127.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="11.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="122.10" speed="23.40"/>
-                <vehicle id="leader" pos="157.90" speed="20.00"/>
+                <vehicle id="follower" pos="110.40" speed="23.40"/>
+                <vehicle id="leader" pos="147.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="12.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="146.34" speed="24.24"/>
-                <vehicle id="leader" pos="177.90" speed="20.00"/>
+                <vehicle id="follower" pos="134.60" speed="24.99"/>
+                <vehicle id="leader" pos="167.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="13.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="169.80" speed="23.47"/>
-                <vehicle id="leader" pos="197.90" speed="20.00"/>
+                <vehicle id="follower" pos="157.96" speed="21.74"/>
+                <vehicle id="leader" pos="187.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="14.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="192.64" speed="22.84"/>
-                <vehicle id="leader" pos="217.90" speed="20.00"/>
+                <vehicle id="follower" pos="180.85" speed="24.04"/>
+                <vehicle id="leader" pos="207.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="15.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="214.92" speed="22.28"/>
-                <vehicle id="leader" pos="237.90" speed="20.00"/>
+                <vehicle id="follower" pos="203.08" speed="20.42"/>
+                <vehicle id="leader" pos="227.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="16.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="236.69" speed="21.77"/>
-                <vehicle id="leader" pos="257.90" speed="20.00"/>
+                <vehicle id="follower" pos="224.81" speed="23.02"/>
+                <vehicle id="leader" pos="247.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="17.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="258.07" speed="21.38"/>
-                <vehicle id="leader" pos="277.90" speed="20.00"/>
+                <vehicle id="follower" pos="246.32" speed="19.99"/>
+                <vehicle id="leader" pos="267.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="18.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="279.14" speed="21.07"/>
-                <vehicle id="leader" pos="297.90" speed="20.00"/>
+                <vehicle id="follower" pos="267.61" speed="22.59"/>
+                <vehicle id="leader" pos="287.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="19.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="299.98" speed="20.83"/>
-                <vehicle id="leader" pos="317.90" speed="20.00"/>
+                <vehicle id="follower" pos="288.58" speed="19.34"/>
+                <vehicle id="leader" pos="307.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="20.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="320.63" speed="20.65"/>
-                <vehicle id="leader" pos="337.90" speed="20.00"/>
+                <vehicle id="follower" pos="309.22" speed="21.94"/>
+                <vehicle id="leader" pos="327.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="21.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="341.13" speed="20.50"/>
-                <vehicle id="leader" pos="357.90" speed="20.00"/>
+                <vehicle id="follower" pos="329.89" speed="19.40"/>
+                <vehicle id="leader" pos="347.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="22.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="361.52" speed="20.39"/>
-                <vehicle id="leader" pos="377.90" speed="20.00"/>
+                <vehicle id="follower" pos="350.55" speed="21.92"/>
+                <vehicle id="leader" pos="367.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="23.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="381.83" speed="20.31"/>
-                <vehicle id="leader" pos="397.90" speed="20.00"/>
+                <vehicle id="follower" pos="370.94" speed="18.87"/>
+                <vehicle id="leader" pos="387.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="24.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="402.07" speed="20.24"/>
-                <vehicle id="leader" pos="417.90" speed="20.00"/>
+                <vehicle id="follower" pos="391.11" speed="21.47"/>
+                <vehicle id="leader" pos="407.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="25.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="422.25" speed="20.18"/>
-                <vehicle id="leader" pos="437.90" speed="20.00"/>
+                <vehicle id="follower" pos="411.41" speed="19.14"/>
+                <vehicle id="leader" pos="427.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="26.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="442.40" speed="20.14"/>
-                <vehicle id="leader" pos="457.90" speed="20.00"/>
+                <vehicle id="follower" pos="431.77" speed="21.58"/>
+                <vehicle id="leader" pos="447.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="27.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="462.51" speed="20.11"/>
-                <vehicle id="leader" pos="477.90" speed="20.00"/>
+                <vehicle id="follower" pos="451.93" speed="18.73"/>
+                <vehicle id="leader" pos="467.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="28.00">
         <edge id="beg">
             <lane id="beg_0">
-                <vehicle id="follower" pos="482.59" speed="20.09"/>
-                <vehicle id="leader" pos="497.90" speed="20.00"/>
+                <vehicle id="follower" pos="471.95" speed="21.33"/>
+                <vehicle id="leader" pos="487.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="29.00">
+        <edge id="beg">
+            <lane id="beg_0">
+                <vehicle id="follower" pos="492.08" speed="18.94"/>
+            </lane>
+        </edge>
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="follower" pos="2.66" speed="20.07"/>
-                <vehicle id="leader" pos="17.90" speed="20.00"/>
+                <vehicle id="leader" pos="7.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="30.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="follower" pos="22.71" speed="20.05"/>
-                <vehicle id="leader" pos="37.90" speed="20.00"/>
+                <vehicle id="follower" pos="12.31" speed="21.52"/>
+                <vehicle id="leader" pos="27.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="31.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="follower" pos="42.76" speed="20.04"/>
-                <vehicle id="leader" pos="57.90" speed="20.00"/>
+                <vehicle id="follower" pos="32.36" speed="18.56"/>
+                <vehicle id="leader" pos="47.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="32.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="follower" pos="62.79" speed="20.03"/>
-                <vehicle id="leader" pos="77.90" speed="20.00"/>
+                <vehicle id="follower" pos="52.22" speed="21.16"/>
+                <vehicle id="leader" pos="67.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="33.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="follower" pos="82.81" speed="20.02"/>
-                <vehicle id="leader" pos="97.90" speed="20.00"/>
+                <vehicle id="follower" pos="72.30" speed="19.00"/>
+                <vehicle id="leader" pos="87.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="34.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="follower" pos="102.83" speed="20.02"/>
-                <vehicle id="leader" pos="117.90" speed="20.00"/>
+                <vehicle id="follower" pos="92.48" speed="21.36"/>
+                <vehicle id="leader" pos="107.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="35.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="follower" pos="122.85" speed="20.01"/>
-                <vehicle id="leader" pos="137.90" speed="20.00"/>
+                <vehicle id="follower" pos="112.50" speed="18.67"/>
+                <vehicle id="leader" pos="127.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="36.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="follower" pos="142.86" speed="20.01"/>
-                <vehicle id="leader" pos="157.90" speed="20.00"/>
+                <vehicle id="follower" pos="132.47" speed="21.27"/>
+                <vehicle id="leader" pos="147.90" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="37.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="follower" pos="162.87" speed="20.01"/>
-                <vehicle id="leader" pos="177.26" speed="19.36"/>
+                <vehicle id="follower" pos="152.50" speed="18.77"/>
+                <vehicle id="leader" pos="166.57" speed="17.34"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="38.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="follower" pos="182.16" speed="19.29"/>
-                <vehicle id="leader" pos="192.11" speed="14.86"/>
+                <vehicle id="follower" pos="169.85" speed="15.94"/>
+                <vehicle id="leader" pos="181.67" speed="12.84"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="39.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="follower" pos="196.95" speed="14.79"/>
-                <vehicle id="leader" pos="202.47" speed="10.36"/>
+                <vehicle id="follower" pos="183.54" speed="11.44"/>
+                <vehicle id="leader" pos="192.26" speed="8.34"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="40.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="208.32" speed="5.86"/>
+                <vehicle id="follower" pos="192.73" speed="6.94"/>
+                <vehicle id="leader" pos="198.36" speed="3.84"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="41.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="209.68" speed="1.36"/>
+                <vehicle id="leader" pos="200.00" speed="0.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="42.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="209.68" speed="0.00"/>
+                <vehicle id="leader" pos="200.00" speed="0.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="43.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="209.68" speed="0.00"/>
+                <vehicle id="leader" pos="200.00" speed="0.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="44.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="209.68" speed="0.00"/>
+                <vehicle id="leader" pos="200.00" speed="0.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="45.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="209.68" speed="0.00"/>
+                <vehicle id="leader" pos="200.00" speed="0.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="46.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="212.28" speed="2.60"/>
+                <vehicle id="leader" pos="200.00" speed="0.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="47.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="217.48" speed="5.20"/>
+                <vehicle id="leader" pos="200.00" speed="0.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="48.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="225.28" speed="7.80"/>
+                <vehicle id="leader" pos="201.30" speed="2.60"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="49.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="235.68" speed="10.40"/>
+                <vehicle id="leader" pos="205.20" speed="5.20"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="50.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="248.68" speed="13.00"/>
+                <vehicle id="leader" pos="211.70" speed="7.80"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="51.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="264.28" speed="15.60"/>
+                <vehicle id="leader" pos="220.80" speed="10.40"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="52.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="282.48" speed="18.20"/>
+                <vehicle id="leader" pos="232.50" speed="13.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="53.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="302.48" speed="20.00"/>
+                <vehicle id="leader" pos="246.80" speed="15.60"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="54.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="322.48" speed="20.00"/>
+                <vehicle id="leader" pos="263.70" speed="18.20"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="55.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="342.48" speed="20.00"/>
+                <vehicle id="leader" pos="282.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="56.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="362.48" speed="20.00"/>
+                <vehicle id="leader" pos="302.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="57.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="382.48" speed="20.00"/>
+                <vehicle id="leader" pos="322.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="58.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="402.48" speed="20.00"/>
+                <vehicle id="leader" pos="342.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="59.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="422.48" speed="20.00"/>
+                <vehicle id="leader" pos="362.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="60.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="442.48" speed="20.00"/>
+                <vehicle id="leader" pos="382.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="61.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="462.48" speed="20.00"/>
+                <vehicle id="leader" pos="402.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="62.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="482.48" speed="20.00"/>
+                <vehicle id="leader" pos="422.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="63.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="502.48" speed="20.00"/>
+                <vehicle id="leader" pos="442.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="64.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="522.48" speed="20.00"/>
+                <vehicle id="leader" pos="462.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="65.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="542.48" speed="20.00"/>
+                <vehicle id="leader" pos="482.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="66.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="562.48" speed="20.00"/>
+                <vehicle id="leader" pos="502.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="67.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="582.48" speed="20.00"/>
+                <vehicle id="leader" pos="522.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="68.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="602.48" speed="20.00"/>
+                <vehicle id="leader" pos="542.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="69.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="622.48" speed="20.00"/>
+                <vehicle id="leader" pos="562.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="70.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="642.48" speed="20.00"/>
+                <vehicle id="leader" pos="582.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="71.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="662.48" speed="20.00"/>
+                <vehicle id="leader" pos="602.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="72.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="682.48" speed="20.00"/>
+                <vehicle id="leader" pos="622.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="73.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="702.48" speed="20.00"/>
+                <vehicle id="leader" pos="642.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="74.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="722.48" speed="20.00"/>
+                <vehicle id="leader" pos="662.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="75.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="742.48" speed="20.00"/>
+                <vehicle id="leader" pos="682.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="76.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="762.48" speed="20.00"/>
+                <vehicle id="leader" pos="702.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="77.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="782.48" speed="20.00"/>
+                <vehicle id="leader" pos="722.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="78.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="802.48" speed="20.00"/>
+                <vehicle id="leader" pos="742.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="79.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="822.48" speed="20.00"/>
+                <vehicle id="leader" pos="762.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="80.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="842.48" speed="20.00"/>
+                <vehicle id="leader" pos="782.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="81.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="862.48" speed="20.00"/>
+                <vehicle id="leader" pos="802.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="82.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="882.48" speed="20.00"/>
+                <vehicle id="leader" pos="822.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="83.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="902.48" speed="20.00"/>
+                <vehicle id="leader" pos="842.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="84.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="922.48" speed="20.00"/>
+                <vehicle id="leader" pos="862.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="85.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="942.48" speed="20.00"/>
+                <vehicle id="leader" pos="882.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="86.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="962.48" speed="20.00"/>
+                <vehicle id="leader" pos="902.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
     <timestep time="87.00">
         <edge id="middle">
             <lane id="middle_0">
-                <vehicle id="leader" pos="982.48" speed="20.00"/>
+                <vehicle id="leader" pos="922.80" speed="20.00"/>
+            </lane>
+        </edge>
+    </timestep>
+    <timestep time="88.00">
+        <edge id="middle">
+            <lane id="middle_0">
+                <vehicle id="leader" pos="942.80" speed="20.00"/>
+            </lane>
+        </edge>
+    </timestep>
+    <timestep time="89.00">
+        <edge id="middle">
+            <lane id="middle_0">
+                <vehicle id="leader" pos="962.80" speed="20.00"/>
+            </lane>
+        </edge>
+    </timestep>
+    <timestep time="90.00">
+        <edge id="middle">
+            <lane id="middle_0">
+                <vehicle id="leader" pos="982.80" speed="20.00"/>
             </lane>
         </edge>
     </timestep>
-    <timestep time="88.00"/>
+    <timestep time="91.00"/>
 </netstate>
diff --git a/sumo/tests/sumo/cf_model/collisions/testsuite.sumo b/sumo/tests/sumo/cf_model/collisions/testsuite.sumo
index 672531635000..980225e911c1 100644
--- a/sumo/tests/sumo/cf_model/collisions/testsuite.sumo
+++ b/sumo/tests/sumo/cf_model/collisions/testsuite.sumo
@@ -1,2 +1,5 @@
 # mass collision using the default model
 pileup
+
+# mass collision using the default model
+pileup_warn
diff --git a/sumo/tests/sumo/meta/help/output.sumo b/sumo/tests/sumo/meta/help/output.sumo
index 6a7c8c579785..2bcdb6f8b2c2 100644
--- a/sumo/tests/sumo/meta/help/output.sumo
+++ b/sumo/tests/sumo/meta/help/output.sumo
@@ -1,4 +1,4 @@
-SUMO Version dev-SVN-r23393
+SUMO Version dev-SVN-r23599
  Copyright (C) 2001-2017 DLR and contributors; http://sumo.dlr.de
 A microscopic road traffic simulation.
 
@@ -122,6 +122,9 @@ Processing Options:
   --ignore-accidents                   Do not check whether accidents occur
   --collision.action STR               How to deal with collisions:
                                          [none,warn,teleport,remove]
+  --collision.stoptime TIME            Let vehicle stop for TIME before
+                                         performing collision.action (except for
+                                         action 'none')
   --collision.check-junctions          Enables collisions checks on junctions
   --max-num-vehicles INT               Delay vehicle insertion to stay within
                                          the given maximum number
@@ -356,6 +359,8 @@ GUI Only Options:
                                          size
   --window-pos STR                     Create initial window at the given x,y
                                          position
+  --osg-view                           Start with an OpenSceneGraph view
+                                         instead of the regular 2D view
 
 
 Examples:
diff --git a/sumo/tests/sumo/meta/write_template_commented_full/cfg.sumo b/sumo/tests/sumo/meta/write_template_commented_full/cfg.sumo
index 9a3496abef0b..63805ea4de49 100644
--- a/sumo/tests/sumo/meta/write_template_commented_full/cfg.sumo
+++ b/sumo/tests/sumo/meta/write_template_commented_full/cfg.sumo
@@ -204,6 +204,9 @@
         <!-- How to deal with collisions: [none,warn,teleport,remove] -->
         <collision.action value="teleport" type="STR"/>
 
+        <!-- Let vehicle stop for TIME before performing collision.action (except for action &apos;none&apos;) -->
+        <collision.stoptime value="0" type="TIME"/>
+
         <!-- Enables collisions checks on junctions -->
         <collision.check-junctions value="false" type="BOOL"/>
 
@@ -534,6 +537,9 @@
         <!-- Create initial window at the given x,y position -->
         <window-pos value="" type="STR"/>
 
+        <!-- Start with an OpenSceneGraph view instead of the regular 2D view -->
+        <osg-view value="false" type="BOOL"/>
+
     </gui_only>
 
 </configuration>
diff --git a/sumo/tests/sumo/meta/write_template_full/cfg.sumo b/sumo/tests/sumo/meta/write_template_full/cfg.sumo
index 1e27fbe1181a..2b062a8a337b 100644
--- a/sumo/tests/sumo/meta/write_template_full/cfg.sumo
+++ b/sumo/tests/sumo/meta/write_template_full/cfg.sumo
@@ -78,6 +78,7 @@
         <ignore-route-errors value="false" type="BOOL" help="Do not check whether routes are connected"/>
         <ignore-accidents value="false" type="BOOL" help="Do not check whether accidents occur"/>
         <collision.action value="teleport" type="STR" help="How to deal with collisions: [none,warn,teleport,remove]"/>
+        <collision.stoptime value="0" type="TIME" help="Let vehicle stop for TIME before performing collision.action (except for action &apos;none&apos;)"/>
         <collision.check-junctions value="false" type="BOOL" help="Enables collisions checks on junctions"/>
         <max-num-vehicles value="-1" type="INT" help="Delay vehicle insertion to stay within the given maximum number"/>
         <scale value="1" type="FLOAT" help="Scale demand by the given factor (by discarding or duplicating vehicles)"/>
@@ -210,6 +211,7 @@
         <disable-textures value="false" synonymes="T" type="BOOL" help="Do not load background pictures"/>
         <window-size value="" type="STR" help="Create initial window with the given x,y size"/>
         <window-pos value="" type="STR" help="Create initial window at the given x,y position"/>
+        <osg-view value="false" type="BOOL" help="Start with an OpenSceneGraph view instead of the regular 2D view"/>
     </gui_only>
 
 </configuration>