Diff between c0873f87 (main) and d1a6d138 (PR)