Make ^9 compatible

Closes #3267148

Merge request reports

Loading