PC50MR-2 Engine Stalls

I working on a PC50MR-2. The engine will stall intermittently when you return to neutral when traveling. The engine will restart each time and the issue will occur again. Once it starts happening it will occur after operating either travel lever or both levers in ether direction(forward or reverse). You can raise the machine and it will still stall. Sometimes the engine has trouble starting. The issue will not occur when operating any of the implement functions. I believe that the pump is not "de-stroking." I believe that the pilot is keeping the pump stroked too long and stalling the engine.

Any thoughts?

Does anyone have a hydraulic schematic for this machine?

PC50MR-2 Engine Stalls