Merge pull request #440 from TheBlueMatt/2020-01-feature-sanity