Implemented ticket #691
"Rework including logic"
Authored by: numere 2022-07-15
Parent: [r1184]
Child: [r1186]
