Merge branch 'backport-3.15-vs-v142-version' into release-3.15

Merge-request: !4133