Merge pull request #649 from jkczyz/2020-06-refactor-chain-listener