Merge remote-tracking branch 'jaimemf/format_spec_groups' (closes #6124)