Merge pull request #1351 from TheBlueMatt/2022-03-scid-privacy