When this is targetted at v3.0 then the v3.1 options should be dropped, and only brought back in when merging up to v3.1. Reason being that the first PR (to v3.0) will be exclusive to v3.0 so shouldn't mention v3.1. The v3.1 version should mention both though.