Merge "PatchTrackBase: fix null pointer dereference issue" into main