82e7553 Rebase downstream patch

Authored and Committed by Florian Müllner 2 years ago
    Rebase downstream patch