[sr-dev] Patches for siptrace