Merge branch 'cherry-pick-d3a3f618' into 'release/0.16'

cherry-pick-d3a3f618 into release/0.16

See merge request !94
20 jobs for release/0.16 in 41 minutes and 27 seconds (queued for 3 seconds)
latest