Tentative online generation for 7_1_0
Resolved conflict