It is unrelated, but also fixes the handling for drafts.
Do you want this to be a separate PR or left unchanged?