Merge branch 'chain_plugin'