Merge pull request #2934 from TheBlueMatt/2023-03-no-num-traits