Merge branch 'WI-001958' into release2

2 jobs for v2.1.1
in 17 seconds, using 0 compute credits, and was queued for 1 second
latest