GPII-672: Save before updating to latest master and infusion