Fix CI failures by updating the reference. Didn't check locally, just copied and applied git patches from CI logs.
Fixes ATR-22460 Fixes ATR-22461