Merge branch 'jc/quickfetch'