Merge branch 'tb/test-shell-lint'