Automated cherry pick of #9553

[mattermost-build]

Cherry pick of #9553 on release-2.37.

/cc @larkox

NONE

[github-actions]

Coverage Comparison Report

Generated on February 27, 2026 at 02:56:44 UTC

+-----------------+------------+------------+-----------+
| Metric          | Main       | This PR    | Diff      |
+-----------------+------------+------------+-----------+
| Lines           |     85.50% |     86.01% |     0.51% |
| Statements      |     85.37% |     85.90% |     0.53% |
| Branches        |     72.52% |     72.94% |     0.42% |
| Functions       |     84.43% |     85.13% |     0.70% |
+-----------------+------------+------------+-----------+
| Total           |     81.95% |     82.49% |     0.54% |
+-----------------+------------+------------+-----------+