Cherrypicked Branding

by Taurean