Second attempt at pull request #25275 This reverts commit b70924bd80, reapplying 2282a5774c
b70924bd80
2282a5774c
localSystem
crossSystem