Rika authored Apr 08, 2023 and Marco Van de Voort committed Dec 17, 2023

This version is correct and supposedly better in other ways (except for a bit of clarity maybe).

(cherry picked from commit 1c4151d8)

edited to work around changes related to the massive unmergable dotted rtl commits.