Merge branch 'tb/test-lint-wc-l'