Diff between f8b2480b (main) and 3171c59d (PR)