Merge pull request #1504 from TheBlueMatt/2022-05-pub-io