GEP-53 Added support for save as draft