Merge "Zen upgrade notification"