Diff between cfafbf3d (main) and 55faae88 (PR)