Public Release.

Cherrypick from FranciscoFranco, Faux123, TrinityFive