Resubmit 'RD-early-measurements' (again)
Resubmit 'RD-early-measurements'
See merge request !138 (merged)
(cherry picked from commit 8e3e8e77)
bd3ec806 Merge branch 'RD-early-measurements' into 'main'
First resubmission rejected since bug fixed was not picked up.