I recommend you to do as soon as you can, so that if we need to add more options it uses the new group. If I'm not wrong, the rest of the PR is completely independent.