Horse: Diamond Upgrade        #12232