Merge branch 'WI-005117-patch-e24d' into 'WI-005117'

Wi 005117 patch e24d

See merge request !2
2 jobs for WI-005117
in 12 seconds, using 0 compute credits, and was queued for 2 seconds