Merge further fixes to process groups from mettle