Merge branch 'jk/fetch-reflog-df-conflict'