Public Release.

Cherry pick from FranciscoFranco, Faux123, TrinityFive, etc.