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