Merge branch 'tr/test-lint-no-export-assignment-in-shell' into maint