Diff between 8df370c3 (main) and 4aa55d2d (PR)