Merge branch '2020-06-refactor-chain-listener-move-chainmonitor' into 2020-06-refacto...