Diff between 1fd9d390 (main) and e58e9d5d (PR)