BZ-12940 updated Saving proposal