[AAP-533] make draft