Merge pull request #1003 from jkczyz/2021-known-features-mask