As an update, option 2 (aggressive) passed in snapshot and AIP-368 is queued for execution. AIP-371 is a duplicate of AIP-368, so it should not be voted on.