Enhanced FS record processing
Merge branch 'fs-records'