Merge branch 'jk/test-chain-lint'