Merge pull request #98635 from thelullabyy/fix/regressions-from-93854-part-4