Merge branch 'js/chain-lint-attrfix'