Merge "Update default cell_v2 cell when it already exists" into stable/pike