Merge pull request #2070 from TheBlueMatt/2023-03-get-key