Merge branch 'jk/fetch-mark-complete-optimization'