GEP-25 Worked on save as draft functionality