Merge branch 'ds/bundle-uri-5'