Merge pull request #1756 from TheBlueMatt/2022-10-rgs-no-std