Merge "Fix TREX linting"