Diff between 31ecf509 (main) and f10723c8 (PR)