Merge pull request #389 from valentinewallace/split-chain-watch-interface