Created branch and initial version for tickets #699 and #729
Authored by: numere 2022-10-10
Parent: [r1228]
Child: [r1230]