Implemented fixes resulting from SW of ticket #576
Authored by: numere 2021-05-04
Parent: [r864]
Child: [r866]