Merge: Ticket #283 to 1.3.1.0 branch
Authored by: matthiasmossner 2020-10-21
Parent: [r2221]
Child: [r2223]