Merge pull request #590 from jkczyz/2020-04-feature-flags