Resolved an issue in implementation of ticket #555
Authored by: numere 2021-03-09
Parent: [r838]
Child: [r840]