#90: Group advanced options
Merge remote-tracking branch 'origin/master'