0000999: Separate Draft upgrade and downgrade