main
Merge remote-tracking branch 'upstream/main' into mergeMain
Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 3012610
Make VB test sample return non-void