I had a little bit of spare time today to refine the patch. Changes: - The patch now comes with a test to avoid regressions. - The patch has a slightly better commit message. Please see the attached file. Thank you! Rudy