- follow-up to PR #18170 to fix the remaining guid conflicts of PR #15634
Please read this before adding new SQL-update files.