Merge pull request #803 from TheBlueMatt/2021-02-derives