Merge branch 'WI-001962' into release2

to be published as V2.2.1
2 jobs for release2
in 18 seconds, using 0 compute credits, and was queued for 3 seconds