Cherry-pick 'end-to-end-test into master' into release/0.15

Original MR: !234 (merged)

This MR was originally intended for the release, but was missed when the release branches were initially created.