Diff between 3a5b18f2 (main) and 1a150cb3 (PR)