Merge branch 'WI-00194' into 'release2'

Final tuning of sources before v2.1.1 publication

See merge request ITS/asn1/cdd_ts102894_2!4
2 jobs for v2.1.1
in 17 seconds, using 0 compute credits, and was queued for 39 seconds
latest