M70 and G64

I created a custom tool change macro that overrides M6 and in it I set G61 to ensure there won't be any collisions. I want the tool change to restore the path control mode once it is done so I used M70. According to the docs, it saves "path control mode (G61, G61.1, G64)"

I see that the mode is correctly switched from G61 back to G64 when the tool change happens. However, I don't think it is restoring the "P" value for G64. I set G64 P0.1 (mm) at the start of my gcode but I saw some huge curves (2+mm) after the tool change. It looks like it is just doing G64 with no P value.

Basically my same question was asked a few years back here forum.linuxcnc.org/40-subroutines-and-ng...re-path-control-mode

Is M70 supposed to restore the tolerance for G64? If not, is there a way to save/restore whatever it was? Do I need to edit my post processor to issue a G64 after each tool change?

Excellent to know this was fixed! I just upgraded to master and can confirm it is behaving as expected. I'll just have to live on the edge for now.