Diff between 8fa3d100 (main) and 6f787946 (PR)