Patch proposal for 359077