Merge branch 'backport-irsl-vs15-future' into release-3.9

Merge-request: !1240