[MERGE] Backporting master-massmailing-graph-dja in 8.0