diff --git a/releaseNote.md b/releaseNote.md
index 0c47fbc92d6..2e7367c7a70 100644
--- a/releaseNote.md
+++ b/releaseNote.md
@@ -1,7 +1,6 @@
 ## Features
 - Add support for ghe.com domain (#2420)
 - Add docker cli to the runner image. (#2425)
-- Uploading step logs to Results service (#2422)
 
 ## Bugs
 - Fix URL construction bug for RunService (#2396)
diff --git a/src/Misc/layoutroot/run-helper.sh.template b/src/Misc/layoutroot/run-helper.sh.template
index 36ca2d94a8f..743fd8b6959 100755
--- a/src/Misc/layoutroot/run-helper.sh.template
+++ b/src/Misc/layoutroot/run-helper.sh.template
@@ -18,6 +18,20 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
 done
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
+# Wait for docker to start
+if [ ! -z "$RUNNER_WAIT_FOR_DOCKER_IN_SECONDS" ]; then
+    if [ "$RUNNER_WAIT_FOR_DOCKER_IN_SECONDS" -gt 0 ]; then
+        echo "Waiting for docker to be ready."
+        for i in $(seq "$RUNNER_WAIT_FOR_DOCKER_IN_SECONDS"); do
+            if docker ps > /dev/null 2>&1; then
+                echo "Docker is ready."
+                break
+            fi
+            "$DIR"/safe_sleep.sh 1
+        done
+    fi
+fi
+
 updateFile="update.finished"
 "$DIR"/bin/Runner.Listener run $*
 
diff --git a/src/runnerversion b/src/runnerversion
index ed039ac8fab..22155b3fbc4 100644
--- a/src/runnerversion
+++ b/src/runnerversion
@@ -1 +1 @@
-2.302.0
+2.302.1