Diff between d0478ccb (main) and c2a4cbdf (PR)