Improved implementation of ticket #757
Created some tests and resolved corresponding regression issues
Authored by: numere 2023-01-13
Parent: [r1300]
Child: [r1302]