Original MR: !276 (merged)
Cherry-picking in dependency changes that were breaking this release's pipeline