Diff between 0fd88e86 (main) and 496ca738 (PR)