Merge pull request #1635 from TheBlueMatt/2022-07-accessor-pub