couple of reverts, patches from v197+
    
    Revert a couple of patches causing surprising breakage.
    Resolves: #896135, #903716
    Pick more post-v197 fixes and minor enhancements from upstream.
    Resolves: #873634, #875531, #860464, #889624, #890827, #756787, #866693, #757928