Merge pull request #1020 from TheBlueMatt/2021-07-log-features-more