XOG 3850 Base Calendar error during Clarity Upgrade