Merge pull request #1496 from TheBlueMatt/2022-05-macro-function-bonus