Merge pull request 'WIP:blockchain' (#155) from blockchain into develop