release/r3-m15 AWS Cherry-pick
Original MR: !276 (merged)
Cherry-picking in dependency changes that were breaking this release's pipeline
Edited by David Diederich
Original MR: !276 (merged)
Cherry-picking in dependency changes that were breaking this release's pipeline