Merge pull request #214636 from aidalgol/heroic-2.6.1
heroic: 2.5.2 -> 2.6.1
authored by Nick Cao and committed by GitHub 3 years ago 862168c4 c738e4a8