f50e4f6 merge upstream patches

Authored and Committed by than 2 years ago
    merge upstream patches