Merge pull request #1839 from ariard/2022-11-increase-visibility-helpers