Merge branch 'jk/fetch-all-peeled-fix'