Merge dependabot/npm_and_yarn/rollup-3.29.2 into combined-prs-branch