Merge branch 'jk/enable-test-lint-by-default' into maint