Merge branch 'pb/multi-fetch'