Merged in v1.64 changes and fixed couple places affected by testpath no longer being available in cmdinfo