PMO-2836 Skip pointless load immediately after a save