Merge "Revert "Correction for raw fragmented RF data"" into main