GmfCollector does not need the site_ids anymore
Merge branch 'gmf-no-expand' into removing-ruptures-3