diff --git a/.github/workflows/firmware_build_test.yml b/.github/workflows/firmware_build_test.yml
index cd324aa3d4..2f0de8e520 100644
--- a/.github/workflows/firmware_build_test.yml
+++ b/.github/workflows/firmware_build_test.yml
@@ -16,7 +16,11 @@ jobs:
         repository: PX4/Firmware
         ref: master
         submodules: recurvise
-    - run: git submodule update --init --recursive
+    - name: Checkout matching branch on PX4/Firmware if possible
+      run: |
+        git fetch origin
+        git checkout ${{github.head_ref}} || echo "Firmware branch: ${{github.head_ref}} not found, using master instead"
+        git submodule update --init --recursive
       working-directory: ../Firmware
     - name: Configure Firmware to include current ECL version
       working-directory: ../Firmware/src/lib/ecl
diff --git a/EKF/estimator_interface.cpp b/EKF/estimator_interface.cpp
index 00c16d44fd..4e82d9ab8e 100644
--- a/EKF/estimator_interface.cpp
+++ b/EKF/estimator_interface.cpp
@@ -387,7 +387,6 @@ void EstimatorInterface::setOpticalFlowData(const flowSample& flow)
 
 			flowSample optflow_sample_new = flow;
 
-			// compensate time-stamp for the trailing edge of the flow data integration period
 			optflow_sample_new.time_us -= _params.flow_delay_ms * 1000;
 			optflow_sample_new.time_us -= FILTER_UPDATE_PERIOD_MS * 1000 / 2;