Merge branch 'ds/partial-bundle-more'