Tweak the update process and prepare to merge it into Master.