Grouping options 1.1.x

Problem/Motivation

I'm cloning this issue to target the new branch
Discussion about the implementation may be followed here, as the parent issue is deprecated