Improved implementation of ticket #650
Authored by: numere 2023-01-29
Parent: [r1312]
Child: [r1314]