- Match MC-273464 fix to implemented fix in 24w33a (#2883)