[#74815894] Merge fixes.