Merge pull request #2046 from TheBlueMatt/2023-02-rgs-robust-and-log