Merge branch 'es/test-lint-one-shot-export'