Merge pull request #589 from jkczyz/2020-04-feature-fixes