Merged branch for ticket #615
Merged revision(s) 1036-1047 from branches/ticket_615:
Authored by: numere 2021-12-06
Parent: [r1047]
Child: [r1049]