Merge pull request #2028 from TheBlueMatt/2023-02-macros-for-wilmer