d691519 Rebase patch due to conflicts

Authored and Committed by lslebodn 5 years ago
    Rebase patch due to conflicts