82e7553 Rebase downstream patch

Authored and Committed by Florian Müllner 8 months ago
    Rebase downstream patch