Porting upstream's 6da09bddd8bf2a938b9c883157921cf1a9139157
Build