Merge branch 'jl/test-lint-scripts'