Merge pull request #834 from TheBlueMatt/2021-03-no-pub-internals