Merge branch 'backport-vs-sdk-selection' into vs-sdk-selection