Diff between 3c598059 (main) and 017f0f62 (PR)