Issue #20715: Save working for both new and updates!