bf7c004c4c
- follow-up to PR #18170 to fix the remaining guid conflicts of PR #15634
- follow-up to PR #18170 to fix the remaining guid conflicts of PR #15634