[#3028] Prep for update usage.