Diff between 6efe4272 (main) and 40d6a5e5 (PR)